1 files changed, 6 insertions, 3 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 1dd819752be0..a343a2a4679f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -5410,9 +5410,12 @@ RTFError RTFDocumentImpl::popState()
         OSL_ASSERT(pShape.get());
         if (pShape.get())
             pShape->getAny() >>= xShape;
-        Mapper().startShape(xShape);
-        Mapper().props(pProperties);
-        Mapper().endShape();
+        if (xShape.is())
+        {
+            Mapper().startShape(xShape);
+            Mapper().props(pProperties);
+            Mapper().endShape();
+        }
         m_aObjectAttributes.clear();
         m_aOLEAttributes.clear();
         m_bObject = false;