diff --git a/server/scanner.js b/server/scanner.js
index 0eec1ec..c32ac3f 100644
--- a/server/scanner.js
+++ b/server/scanner.js
@@ -238,13 +238,14 @@ function convertNefToJpg(path, file) {
         if (code != 0) {
           return reject("UFRAW for " + path + "/" + file + " returned an error: " + code);
         }
-        fs.rename(path + "/" + file, path + "/raw/" + path, function(err) {
-          if (err) {
-            console.error("Unable to move RAW file: " + path + "/" + file);
-            return reject(err);
-          } else {
+        return mkdirPromise(path + "/raw").then(function() {
+          fs.rename(path + "/" + file, path + "/raw/" + file, function(err) {
+            if (err) {
+              console.error("Unable to move RAW file: " + path + "/" + file);
+              return reject(err);
+            }
             return resolve();
-          }
+          });
         });
       });
     });