diff --git a/src/Gifitti/Gifitti/Models/GifModel.cs b/src/Gifitti/Gifitti/Models/GifModel.cs
index 7497260d60d7559e159947233f85e1b168dbfcc9..1cb60643e194a27ebfde1cd2f00f99df9a0f6118 100644
--- a/src/Gifitti/Gifitti/Models/GifModel.cs
+++ b/src/Gifitti/Gifitti/Models/GifModel.cs
@@ -70,12 +70,11 @@ namespace Gifitti.Models
         public void saveGif(string path)
         {
             //Error Handel on path
-
             //RE for path with extension
             Regex extensionTester = new Regex(@"^.*\.[g|G][i|I][f|F]$");
             //RE for path without extension
-            Regex savePathTester = new Regex(@"^(([^\/\\]+)[\/\\])*([^\/\\]*)");
-            if (!savePathTester.IsMatch(path))
+            Regex savePathTester = new Regex(@"^((?:(?:[^\/\\]+)*[\/\\]*)*)[\/\\]([^\/\\]*)$");
+            if (!savePathTester.IsMatch(path) || !Directory.Exists(savePathTester.Match(path).Groups[1].ToString()))
             {
                 throw new DirectoryNotFoundException();
             }
diff --git a/src/Gifitti/Gifitti/View_Models/Form1.cs b/src/Gifitti/Gifitti/View_Models/Form1.cs
index ee19fe0b4f9946a205206c01e5a02fdd1b58665a..d3993d4bd1196edb6177447b99eca5bf65f08864 100644
--- a/src/Gifitti/Gifitti/View_Models/Form1.cs
+++ b/src/Gifitti/Gifitti/View_Models/Form1.cs
@@ -261,7 +261,7 @@ namespace Gifitti.View_Models
                 path = saveGifFileDialog.FileName;
             
             //Handel Close
-            if (path.Equals(null))
+            if (path == null)
                 return;
             //TODO temp write
             Console.WriteLine(path);