diff --git a/src/Mod/Draft/draftobjects/shape2dview.py b/src/Mod/Draft/draftobjects/shape2dview.py
index 8b7c9a363d..faed945a8c 100644
--- a/src/Mod/Draft/draftobjects/shape2dview.py
+++ b/src/Mod/Draft/draftobjects/shape2dview.py
@@ -198,6 +198,8 @@ class Shape2DView(DraftObject):
     def _get_shapes(self, shape, onlysolids=False):
         if onlysolids:
             return shape.Solids
+        if shape.isNull():
+            return []
         if shape.ShapeType == "Compound":
             return shape.SubShapes
         return [shape.copy()]