diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp
index f657693ba9..81c8f19301 100644
--- a/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp
+++ b/src/Mod/Part/App/BRepOffsetAPI_MakeOffsetFix.cpp
@@ -159,6 +159,11 @@ const TopoDS_Shape& BRepOffsetAPI_MakeOffsetFix::Shape()
 {
     if (myResult.IsNull()) {
         TopoDS_Shape result = mkOffset.Shape();
+        if (result.IsNull()) {
+            myResult = result;
+            return myResult;
+        }
+
         if (result.ShapeType() == TopAbs_WIRE) {
             MakeWire(result);
         }