diff --git a/src/Mod/Part/Gui/TaskAttacher.cpp b/src/Mod/Part/Gui/TaskAttacher.cpp
index e616dd9976..87aaefa9f3 100644
--- a/src/Mod/Part/Gui/TaskAttacher.cpp
+++ b/src/Mod/Part/Gui/TaskAttacher.cpp
@@ -214,7 +214,11 @@ TaskAttacher::TaskAttacher(Gui::ViewProviderDocumentObject *ViewProvider,QWidget
 
 TaskAttacher::~TaskAttacher()
 {
-    visibilityAutomation(false);
+    try {
+        visibilityAutomation(false);
+    }
+    catch (...) {
+    }
 
     connectDelObject.disconnect();
     delete ui;
diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
index 177b259931..f9b43fcf78 100644
--- a/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
+++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.cpp
@@ -507,7 +507,7 @@ TaskDlgFeaturePick::~TaskDlgFeaturePick()
     //do the work now as before in accept() the dialog is still open, hence the work
     //function could not open another dialog
     if (accepted) {
-        workFunction(pick->buildFeatures());
+        try { workFunction(pick->buildFeatures()); } catch (...) {}
     } else if (abortFunction) {
 
         // Get rid of the TaskFeaturePick before the TaskDialog dtor does. The
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index 96dbf25038..b1dd697b15 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -6060,6 +6060,7 @@ public:
         , EditCurve(2)
         , BaseGeoId(-1)
         , ExtendFromStart(false)
+        , SavedExtendFromStart(false)
         , Increment(0)
     {
     }