diff --git a/FlatCAMObj.py b/FlatCAMObj.py
index 73da1e3c..427894ae 100644
--- a/FlatCAMObj.py
+++ b/FlatCAMObj.py
@@ -4026,6 +4026,12 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         self.ui.ois_tcz_geo.on_cb_change()
 
     def gui_form_to_storage(self):
+
+        if self.ui.geo_tools_table.rowCount() == 0:
+            # there is no tool in tool table so we can't save the GUI elements values to storage
+            log.debug("FlatCAMGeometry.gui_form_to_storage() --> no tool in Tools Table, aborting.")
+            return
+
         self.ui_disconnect()
         widget_changed = self.sender()
         try:
diff --git a/README.md b/README.md
index 5a660c2a..fc4be61e 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
 
 =================================================
 
+30.07.2019
+
+- fixed bug that crashed the software when trying to edit a GUI value in Geometry selected tab without having a tool in the Tools Table
+
 28.07.2019
 
 - fixed issue with not using the current units in the tool tables after unit conversion