diff --git a/CHANGELOG.md b/CHANGELOG.md
index efb369f5..9ebd6439 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,9 @@ CHANGELOG for FlatCAM beta
 - some fixes in Drilling Tool and in camlib.py file
 - working on Milling Tool
 - working in Drilling Tool to make it more robust
-
+- Drilling Tool - fixed an issue with dropping the changes done in the UI
+- Drilling Tool - fixed an issue when Drilling Tool is open and the last Excellon object is deleted
+  
 21.01.2021
 
 - added ability to see the verbose log when importing SVG's (if set in preferences)
diff --git a/appTools/ToolDrilling.py b/appTools/ToolDrilling.py
index 268ee2e1..8b072069 100644
--- a/appTools/ToolDrilling.py
+++ b/appTools/ToolDrilling.py
@@ -402,13 +402,13 @@ class ToolDrilling(AppTool, Excellon):
         # reset the Excellon preprocessor combo
         self.ui.pp_excellon_name_cb.clear()
         # populate Excellon preprocessor combobox list
-        if loaded_obj.options['tools_drill_ppname_e'] == 'Check_points':
+        if loaded_obj and loaded_obj.options['tools_drill_ppname_e'] == 'Check_points':
             pp_list = ['Check_points']
         else:
             pp_list = []
             for name in self.app.preprocessors.keys():
                 # the HPGL preprocessor or Paste_ are not for Excellon job therefore don't add it
-                if name in ['hpgl', 'Paste_1']:
+                if name in ['hpgl', 'Paste_1', 'Check_points']:
                     continue
                 pp_list.append(name)
             pp_list.sort()