diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py
index f24e24527..a14204338 100644
--- a/src/Mod/Arch/ArchStructure.py
+++ b/src/Mod/Arch/ArchStructure.py
@@ -570,6 +570,8 @@ class _Structure(ArchComponent.Component):
         base = None
         if obj.Base:
             if obj.Base.isDerivedFrom("Part::Feature"):
+                if obj.Base.Shape.isNull():
+                    return
                 if hasattr(obj,"Tool"):
                     if obj.Tool:
                         try:
diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index 49ecc0ace..935167c7b 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -4536,6 +4536,8 @@ class _Clone(_DraftObject):
         shapes = []
         for o in obj.Objects:
             if o.isDerivedFrom("Part::Feature"):
+                if o.Shape.isNull():
+                    return
                 sh = o.Shape.copy()
                 m = FreeCAD.Matrix()
                 if hasattr(obj,"Scale") and not sh.isNull():