diff --git a/src/Mod/Sketcher/Gui/DrawSketchController.h b/src/Mod/Sketcher/Gui/DrawSketchController.h
index f65ebe3b48..9381b3b92d 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchController.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchController.h
@@ -454,7 +454,7 @@ public:
     /// triggered by the controllable DSH after a mode change has been effected
     virtual void afterHandlerModeChanged()
     {
-        if (!handler->isState(SelectModeT::End) || handler->continuousMode) {
+        if (handler && (!handler->isState(SelectModeT::End) || handler->continuousMode)) {
             handler->mouseMove(prevCursorPosition);
         }
     }