diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index 8d4e0439f6..4487571967 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -277,9 +277,11 @@ void switchToDocument(const App::Document* doc)
                                                 sketch->getNameInDocument(), Datum.c_str(), side.c_str());
 
                         Gui::Selection().clearSelection();
-                        Gui::Selection().addSelection(doc->getName(), oldTip->getNameInDocument());
-                        Gui::Command::doCommand(Gui::Command::Gui,"FreeCADGui.runCommand('PartDesign_MoveTip')");
-                        Gui::Selection().clearSelection();
+                        if (oldTip != NULL) {
+                            Gui::Selection().addSelection(doc->getName(), oldTip->getNameInDocument());
+                            Gui::Command::doCommand(Gui::Command::Gui,"FreeCADGui.runCommand('PartDesign_MoveTip')");
+                            Gui::Selection().clearSelection();
+                        }
                     }
                 }