diff --git a/download_manager.cpp b/download_manager.cpp
index 35c8109..b89ac22 100644
--- a/download_manager.cpp
+++ b/download_manager.cpp
@@ -55,11 +55,13 @@
                      entry("FILENAME=%s", fileName),
                      entry("SERVERADDRESS=%s", serverAddress));
 
-    // Check if IMAGE DIR exists and create if necessary.
+    // Check if IMAGE DIR exists
     fs::path imgDirPath(IMG_UPLOAD_DIR);
     if (!fs::is_directory(imgDirPath))
     {
-        fs::create_directory(imgDirPath);
+        log<level::ERR>("Error Image Dir does not exist");
+        elog<InternalFailure>();
+        return;
     }
 
     pid_t pid = fork();
diff --git a/watch.cpp b/watch.cpp
index 9921bbd..c3aa7e9 100644
--- a/watch.cpp
+++ b/watch.cpp
@@ -29,10 +29,7 @@
     fs::path imgDirPath(IMG_UPLOAD_DIR);
     if (!fs::is_directory(imgDirPath))
     {
-        log<level::ERR>("ERROR No Image Dir",
-                        entry("IMAGEDIR=%s", IMG_UPLOAD_DIR));
-        throw std::runtime_error(
-            "No Image Dir, IMAGEDIR=" + std::string{IMG_UPLOAD_DIR});
+        fs::create_directories(imgDirPath);
     }
 
     fd = inotify_init1(IN_NONBLOCK);