diff --git a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
index 1351041e06..42a0d6f4d3 100644
--- a/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
+++ b/src/Mod/TechDraw/Gui/CommandCreateDims.cpp
@@ -120,6 +120,7 @@ void positionDimText(DrawViewDimension* dim, int indexOffset = 0);
 
 void activateHandler(TechDrawHandler* newHandler)
 {
+    std::unique_ptr<TechDrawHandler> ptr(newHandler);
     auto* mdi = qobject_cast<MDIViewPage*>(Gui::getMainWindow()->activeWindow());
     if (!mdi) {
         return;
@@ -134,7 +135,7 @@ void activateHandler(TechDrawHandler* newHandler)
     if (!viewPage) {
         return;
     }
-    viewPage->activateHandler(newHandler);
+    viewPage->activateHandler(ptr.release());
 }
 
 //===========================================================================
@@ -517,8 +518,12 @@ public:
             return;
         }
 
+        App::Document* pageDoc = nullptr;
+        if (auto page = getPage()) {
+            pageDoc = page->getDocument();
+        }
         if (msg.Object.getObjectName().empty()
-            || msg.Object.getDocument() != getPage()->getDocument()) {
+            || (msg.Object.getDocument() != pageDoc)) {
             if (msg.Type == Gui::SelectionChanges::AddSelection) {
                 Gui::Selection().rmvSelection(msg.pDocName, msg.pObjectName, msg.pSubName);
             }
diff --git a/src/Mod/TechDraw/Gui/TechDrawHandler.cpp b/src/Mod/TechDraw/Gui/TechDrawHandler.cpp
index bd182c4497..9e06322220 100644
--- a/src/Mod/TechDraw/Gui/TechDrawHandler.cpp
+++ b/src/Mod/TechDraw/Gui/TechDrawHandler.cpp
@@ -109,7 +109,9 @@ void TechDrawHandler::mouseReleaseEvent(QMouseEvent* event)
 
 void TechDrawHandler::quit()
 {
-    viewPage->deactivateHandler();
+    if (viewPage) {
+        viewPage->deactivateHandler();
+    }
 }
 
 QWidget* TechDrawHandler::getCursorWidget()
@@ -127,5 +129,5 @@ void TechDrawHandler::setWidgetCursor(QCursor cursor)
 
 TechDraw::DrawPage* TechDrawHandler::getPage()
 {
-    return viewPage->getDrawPage();
-}
\ No newline at end of file
+    return viewPage ? viewPage->getDrawPage() : nullptr;
+}