diff --git a/src/Mod/Assembly/JointObject.py b/src/Mod/Assembly/JointObject.py
index 1812407c34..6a225b0889 100644
--- a/src/Mod/Assembly/JointObject.py
+++ b/src/Mod/Assembly/JointObject.py
@@ -282,6 +282,9 @@ class Joint:
                 self.updateJCSPlacements(joint)
                 obj1 = UtilsAssembly.getObjectInPart(joint.Object1, joint.Part1)
                 obj2 = UtilsAssembly.getObjectInPart(joint.Object2, joint.Part2)
+                if obj1 is None or obj2 is None:
+                    return
+
                 presolved = self.preSolve(
                     joint,
                     obj1,
diff --git a/src/Mod/Assembly/UtilsAssembly.py b/src/Mod/Assembly/UtilsAssembly.py
index 0bf3be07a8..3495637e0f 100644
--- a/src/Mod/Assembly/UtilsAssembly.py
+++ b/src/Mod/Assembly/UtilsAssembly.py
@@ -241,6 +241,9 @@ def getContainingPart(full_name, selected_object, activeAssemblyOrPart=None):
 
 
 def getObjectInPart(objName, part):
+    if part is None:
+        return None
+
     if part.Name == objName:
         return part