diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp
index a05c6d3376..7678b9be44 100644
--- a/src/App/PropertyLinks.cpp
+++ b/src/App/PropertyLinks.cpp
@@ -291,8 +291,14 @@ void PropertyLinkList::Save(Base::Writer &writer) const
 {
     writer.Stream() << writer.ind() << "<LinkList count=\"" << getSize() << "\">" << endl;
     writer.incInd();
-    for (int i = 0; i<getSize(); i++)
-        writer.Stream() << writer.ind() << "<Link value=\"" << _lValueList[i]->getNameInDocument() << "\"/>" << endl;;
+    for (int i = 0; i<getSize(); i++) {
+        DocumentObject* obj = _lValueList[i];
+        if (obj)
+            writer.Stream() << writer.ind() << "<Link value=\"" << obj->getNameInDocument() << "\"/>" << endl;
+        else
+            writer.Stream() << writer.ind() << "<Link value=\"\"/>" << endl;
+    }
+
     writer.decInd();
     writer.Stream() << writer.ind() << "</LinkList>" << endl;
 }
diff --git a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp
index aedd553e95..c819edd9ee 100644
--- a/src/Mod/Import/App/ImportOCAF.cpp
+++ b/src/Mod/Import/App/ImportOCAF.cpp
@@ -211,10 +211,10 @@ void ImportOCAF::loadShapes(const TDF_Label& label, const TopLoc_Location& loc,
                 loadShapes(it.Value(), part_loc, part_name, asm_name, isRef, localValue);
             }
 
-            if (pcCompound)
+            if (pcCompound) {
                 pcCompound->Links.setValues(localValue);
-
-            lValue.push_back(pcCompound);
+                lValue.push_back(pcCompound);
+            }
         }
     }
 }