diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py
index f4d71d0ed..ff5af0258 100644
--- a/src/Mod/Arch/ArchCommands.py
+++ b/src/Mod/Arch/ArchCommands.py
@@ -401,9 +401,13 @@ def getShapeFromMesh(mesh):
         if len(i) > 0:
             wires = MeshPart.wireFromSegment(mesh, i)
             if wires:
-                faces.append(makeFace(wires))
+                try:
+                    faces.append(makeFace(wires))
+                except:
+                    return None
     try:
         se = Part.makeShell(faces)
+        se = se.removeSplitter()
     except:
         return None
     else: