diff --git a/CHANGELOG.md b/CHANGELOG.md
index b75574da..e412fd25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG for FlatCAM beta
 
 - in Cutout, 2Sided, Film, NCC, Paint, Panelize and Subtract Tool made sure that the object selection in Project Tab reflects in the selected object in the Tools
 - set the shortcut key for Milling Tool to ALt+M and for Corner Markers Tool to Alt+B
+- fixed a bug introduced by first mod today, when the selected object is of 'cncjob' kind.
 
 3.12.2020
 
diff --git a/appTools/ToolDblSided.py b/appTools/ToolDblSided.py
index 2dc77ff7..01735459 100644
--- a/appTools/ToolDblSided.py
+++ b/appTools/ToolDblSided.py
@@ -177,12 +177,13 @@ class DblSidedTool(AppTool):
             name = current.indexes()[0].internalPointer().obj.options['name']
             kind = current.indexes()[0].internalPointer().obj.kind
 
-            obj_type = {'gerber': 'grb', 'excellon': 'exc', 'geometry': 'geo'}[kind]
-            self.ui.object_type_radio.set_value(obj_type)
-            self.ui.box_type_radio.set_value(obj_type)
+            if kind in ['gerber', 'excellon', 'geometry']:
+                obj_type = {'gerber': 'grb', 'excellon': 'exc', 'geometry': 'geo'}[kind]
+                self.ui.object_type_radio.set_value(obj_type)
+                self.ui.box_type_radio.set_value(obj_type)
 
-            self.ui.object_combo.set_value(name)
-        except IndexError:
+                self.ui.object_combo.set_value(name)
+        except Exception:
             pass
 
     def on_create_alignment_holes(self):
diff --git a/appTools/ToolFilm.py b/appTools/ToolFilm.py
index c88c3894..fb5e050c 100644
--- a/appTools/ToolFilm.py
+++ b/appTools/ToolFilm.py
@@ -100,7 +100,7 @@ class Film(AppTool):
 
                 self.ui.tf_object_combo.set_value(name)
                 self.ui.tf_box_combo.set_value(name)
-        except IndexError:
+        except Exception:
             pass
 
     def run(self, toggle=True):
diff --git a/appTools/ToolNCC.py b/appTools/ToolNCC.py
index fa7f1ee4..95a05df7 100644
--- a/appTools/ToolNCC.py
+++ b/appTools/ToolNCC.py
@@ -280,7 +280,7 @@ class NonCopperClear(AppTool, Gerber):
                 self.ui.type_obj_radio.set_value(kind)
 
             self.ui.object_combo.set_value(name)
-        except IndexError:
+        except Exception:
             pass
 
     def on_toggle_all_rows(self):
diff --git a/appTools/ToolPaint.py b/appTools/ToolPaint.py
index 26d0063e..49198527 100644
--- a/appTools/ToolPaint.py
+++ b/appTools/ToolPaint.py
@@ -292,7 +292,7 @@ class ToolPaint(AppTool, Gerber):
                 self.ui.type_obj_radio.set_value(kind)
 
             self.ui.obj_combo.set_value(name)
-        except IndexError:
+        except Exception:
             pass
 
     def update_ui(self):
diff --git a/appTools/ToolPanelize.py b/appTools/ToolPanelize.py
index 0ca7afd4..8bddf383 100644
--- a/appTools/ToolPanelize.py
+++ b/appTools/ToolPanelize.py
@@ -204,9 +204,10 @@ class Panelize(AppTool):
             name = current.indexes()[0].internalPointer().obj.options['name']
             kind = current.indexes()[0].internalPointer().obj.kind
 
-            obj_type = {
-                "gerber": _("Gerber"), "excellon": _("Excellon"), "geometry": _("Geometry")
-            }[kind]
+            if kind in ['gerber', 'excellon', 'geometry']:
+                obj_type = {
+                    "gerber": _("Gerber"), "excellon": _("Excellon"), "geometry": _("Geometry")
+                }[kind]
 
             self.ui.type_obj_combo.set_value(obj_type)
             self.ui.type_box_combo.set_value(obj_type)
@@ -216,7 +217,7 @@ class Panelize(AppTool):
 
             self.ui.object_combo.set_value(name)
             self.ui.box_combo.set_value(name)
-        except IndexError:
+        except Exception:
             pass
 
     def on_panelize(self):
diff --git a/appTools/ToolSub.py b/appTools/ToolSub.py
index ae9798d5..18c2335c 100644
--- a/appTools/ToolSub.py
+++ b/appTools/ToolSub.py
@@ -173,7 +173,7 @@ class ToolSub(AppTool):
                 self.ui.target_gerber_combo.set_value(name)
             if kind == 'geometry':
                 self.ui.target_geo_combo.set_value(name)
-        except IndexError:
+        except Exception:
             pass
 
     def set_tool_ui(self):