diff --git a/README.md b/README.md
index 31cefb24..95ee23e6 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ CAD program, and create G-Code for Isolation routing.
 - another fix (final one) for the Exception generated by the annotations set not to show in Preferences
 - updated translations and changed version
 - fixed installer issue for the x64 version due of the used CX_FREEZE python package which was in unofficial version (obviously not ready to be used)
+- fixed bug in Geometry Editor, in disconnect_canvas_event_handlers() where I left some part of code without adding a try - except block which was required
 - RELEASE 8.95
 
 17.08.2019
diff --git a/flatcamEditors/FlatCAMGeoEditor.py b/flatcamEditors/FlatCAMGeoEditor.py
index 072bbc4c..488821e3 100644
--- a/flatcamEditors/FlatCAMGeoEditor.py
+++ b/flatcamEditors/FlatCAMGeoEditor.py
@@ -3352,14 +3352,41 @@ class FlatCAMGeoEditor(QtCore.QObject):
         except (TypeError, AttributeError):
             pass
 
-        self.app.ui.draw_circle.triggered.disconnect()
-        self.app.ui.draw_poly.triggered.disconnect()
-        self.app.ui.draw_arc.triggered.disconnect()
+        try:
+            self.app.ui.draw_circle.triggered.disconnect()
+        except (TypeError, AttributeError):
+            pass
 
-        self.app.ui.draw_text.triggered.disconnect()
-        self.app.ui.draw_buffer.triggered.disconnect()
-        self.app.ui.draw_paint.triggered.disconnect()
-        self.app.ui.draw_eraser.triggered.disconnect()
+        try:
+            self.app.ui.draw_poly.triggered.disconnect()
+        except (TypeError, AttributeError):
+            pass
+
+        try:
+            self.app.ui.draw_arc.triggered.disconnect()
+        except (TypeError, AttributeError):
+            pass
+
+
+        try:
+            self.app.ui.draw_text.triggered.disconnect()
+        except (TypeError, AttributeError):
+            pass
+
+        try:
+            self.app.ui.draw_buffer.triggered.disconnect()
+        except (TypeError, AttributeError):
+            pass
+
+        try:
+            self.app.ui.draw_paint.triggered.disconnect()
+        except (TypeError, AttributeError):
+            pass
+
+        try:
+            self.app.ui.draw_eraser.triggered.disconnect()
+        except (TypeError, AttributeError):
+            pass
 
         try:
             self.app.ui.draw_union.triggered.disconnect(self.union)
@@ -3376,7 +3403,10 @@ class FlatCAMGeoEditor(QtCore.QObject):
         except (TypeError, AttributeError):
             pass
 
-        self.app.ui.draw_transform.triggered.disconnect()
+        try:
+            self.app.ui.draw_transform.triggered.disconnect()
+        except (TypeError, AttributeError):
+            pass
 
     def add_shape(self, shape):
         """