diff --git a/src/Mod/Path/PathScripts/PathOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py
index f701d1bf98..c4ac06c291 100644
--- a/src/Mod/Path/PathScripts/PathOpGui.py
+++ b/src/Mod/Path/PathScripts/PathOpGui.py
@@ -366,9 +366,10 @@ class TaskPanelPage(object):
             combo.blockSignals(False)
 
     def resetToolController(self, job, tc):
-        self.obj.ToolController = tc
-        combo = self.form.toolController
-        self.setupToolController(self.obj, combo)
+        if self.obj is not None:
+            self.obj.ToolController = tc
+            combo = self.form.toolController
+            self.setupToolController(self.obj, combo)
 
     def setupToolController(self, obj, combo):
         '''setupToolController(obj, combo) ...
diff --git a/src/Mod/Path/PathScripts/PathToolController.py b/src/Mod/Path/PathScripts/PathToolController.py
index 7eec1c2132..11fe248b4f 100644
--- a/src/Mod/Path/PathScripts/PathToolController.py
+++ b/src/Mod/Path/PathScripts/PathToolController.py
@@ -98,7 +98,7 @@ class ToolController:
             if hasattr(obj.Tool, 'InList') and len(obj.Tool.InList) == 1:
                 if hasattr(obj.Tool.Proxy, 'onDelete'):
                     obj.Tool.Proxy.onDelete(obj.Tool)
-                obj.Document.removeObject(obj.Tool.Name)
+                #obj.Document.removeObject(obj.Name)
 
     def setFromTemplate(self, obj, template):
         '''