diff --git a/src/Mod/PartDesign/App/Feature.cpp b/src/Mod/PartDesign/App/Feature.cpp
index 188607140a..63cc6e85ba 100644
--- a/src/Mod/PartDesign/App/Feature.cpp
+++ b/src/Mod/PartDesign/App/Feature.cpp
@@ -156,6 +156,9 @@ Part::Feature* Feature::getBaseObject(bool silent) const {
 const TopoDS_Shape& Feature::getBaseShape() const {
     const Part::Feature* BaseObject = getBaseObject();
 
+    if (!BaseObject)
+        throw Base::ValueError("Base feature's shape is not defined");
+
     if (BaseObject->isDerivedFrom(PartDesign::ShapeBinder::getClassTypeId())||
         BaseObject->isDerivedFrom(PartDesign::SubShapeBinder::getClassTypeId()))
     {
diff --git a/tests/src/Base/Vector3D.cpp b/tests/src/Base/Vector3D.cpp
index 6020637100..6dba2b5824 100644
--- a/tests/src/Base/Vector3D.cpp
+++ b/tests/src/Base/Vector3D.cpp
@@ -328,4 +328,3 @@ TEST(Vector, TestAngleOriented)
 }
 
 // NOLINTEND
-