diff --git a/src/Mod/PartDesign/App/Body.cpp b/src/Mod/PartDesign/App/Body.cpp
index d8195fa64..016150321 100644
--- a/src/Mod/PartDesign/App/Body.cpp
+++ b/src/Mod/PartDesign/App/Body.cpp
@@ -257,6 +257,9 @@ bool Body::isAllowed(const App::DocumentObject* f)
 
 Body* Body::findBodyOf(const App::DocumentObject* feature)
 {
+    if(!feature)
+        return nullptr;
+    
     return static_cast<Body*>(BodyBase::findBodyOf(feature));
 }