diff --git a/src/ShapePersistent/ShapePersistent_BRep.cxx b/src/ShapePersistent/ShapePersistent_BRep.cxx
index 3ba3ac23b8..d23c4ce76d 100644
--- a/src/ShapePersistent/ShapePersistent_BRep.cxx
+++ b/src/ShapePersistent/ShapePersistent_BRep.cxx
@@ -644,7 +644,8 @@ Handle(TopoDS_TShape) ShapePersistent_BRep::pTVertex::createTShape() const
   aTVertex->Tolerance (myTolerance);
   aTVertex->Pnt       (myPnt);
 
-  myPoints->Import (aTVertex->ChangePoints());
+  if (myPoints)
+    myPoints->Import (aTVertex->ChangePoints());
 
   return aTVertex;
 }
@@ -662,7 +663,8 @@ Handle(TopoDS_TShape) ShapePersistent_BRep::pTEdge::createTShape() const
   aTEdge->SameRange     ((myFlags & RangeMask)       != 0);
   aTEdge->Degenerated   ((myFlags & DegeneratedMask) != 0);
 
-  myCurves->Import (aTEdge->ChangeCurves());
+  if (myCurves)
+    myCurves->Import (aTEdge->ChangeCurves());
 
   return aTEdge;
 }
diff --git a/tests/xml/data/ocaf/D7 b/tests/xml/data/ocaf/D7
new file mode 100644
index 0000000000..85d6ce0e39
--- /dev/null
+++ b/tests/xml/data/ocaf/D7
@@ -0,0 +1,12 @@
+#Test of bug 28842 (failure on open a standard OCAF document on Fedora).
+
+Open [locate_data_file save_V7_8_0_GEOM_MDTV-Standard.sgd] D
+
+# Check a shape.
+set res [CheckLabel D 0:1:20:1:1:2]
+set index [lsearch ${res} TNaming_NamedShape]
+if { ${index} == -1} {
+    puts "Error: reading of the document failed."
+} else {
+    puts "OK"
+}