diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
index 5eef340e8c31..bac5c64a5089 100644
--- a/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
+++ b/src/Mod/PartDesign/Gui/ViewProviderBody.cpp
@@ -233,9 +233,9 @@ void ViewProviderBody::updateData(const App::Property* prop)
         auto features = body->Group.getValues();
 
         // restore icons
-        for ( auto feature : features) {
+        for (auto feature : features) {
             Gui::ViewProvider* vp = Gui::Application::Instance->activeDocument()->getViewProvider(feature);
-            if(vp->isDerivedFrom(PartDesignGui::ViewProvider::getClassTypeId())) {
+            if (vp && vp->isDerivedFrom(PartDesignGui::ViewProvider::getClassTypeId())) {
                 static_cast<PartDesignGui::ViewProvider*>(vp)->setTipIcon(feature == tip);
             }
         }