Arch/Draft: minor fixes

src/Mod/Arch/importSHP.py

@@ -72,8 +72,7 @@ def insert(filename,docname,record=None):
                                                translate("Arch","Shapes elevation"),
                                                translate("Arch","Choose which field provides shapes elevations:"),
                                                fields)
-            if reply[1]:
-                if record != "None":
+            if reply[1] and reply[0] != "None":
                     record = reply[0]
     
     # build shapes

src/Mod/Draft/draftutils/utils.py

@@ -561,7 +561,7 @@ def get_clone_base(obj, strict=False):
     if hasattr(obj, "CloneOf"):
         if obj.CloneOf:
             return get_clone_base(obj.CloneOf)
-    if get_type(obj) == "Clone":
+    if get_type(obj) == "Clone" and obj.Objects:
         return obj.Objects[0]
     if strict:
         return False