diff --git a/FlatCAMApp.py b/FlatCAMApp.py
index d2e5d916..a984366f 100644
--- a/FlatCAMApp.py
+++ b/FlatCAMApp.py
@@ -1665,6 +1665,8 @@ class App(QtCore.QObject):
         loc = self.defaults["global_last_save_folder"]
         if loc is None:
             loc = self.defaults["global_last_folder"]
+        if loc is None:
+            loc = os.path.dirname(__file__)
         return loc
 
     def report_usage(self, resource):
diff --git a/README.md b/README.md
index a2d78ef4..98d63e29 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ CAD program, and create G-Code for Isolation routing.
 
 9.02.2019
 
-- 
+- added a protection for when saving a file first time, it require a saved path and if none then it use the current working directory
 
 8.02.2019