diff --git a/matlab/CheckPath.m b/matlab/CheckPath.m
index 209a0d609a89904380c2255589709fbe2575e924..fde154c9af57d9edb0f33424982a30f22ac9d78b 100644
--- a/matlab/CheckPath.m
+++ b/matlab/CheckPath.m
@@ -32,12 +32,16 @@ DirectoryName = [ dname '/' type ];
 
 if ~isdir(dname)
     % Make sure there isn't a file with the same name, see trac ticket #47
-    delete(dname)
+    if isfile(dname)
+        delete(dname)
+    end
     mkdir('.', dname);
 end
 
 if ~isdir(DirectoryName)
     % Make sure there isn't a file with the same name, see trac ticket #47
-    delete(DirectoryName)
+    if isfile(DirectoryName)
+        delete(DirectoryName)
+    end
     mkdir('.',DirectoryName);
 end