diff --git a/server/scanner.js b/server/scanner.js
index 465334f..86b2e17 100644
--- a/server/scanner.js
+++ b/server/scanner.js
@@ -241,8 +241,11 @@ function convertNefToJpg(path, file) {
 
       ufraw.on('exit', function(code, signal) {
         if (signal || code != 0) {
-          console.error("UFRAW for " + path + "/" + file + " returned an error: " + code + "\n" + signal + "\n" + error + "\n");
-          return moveCorrupt(path, file);
+          let error = "UFRAW for " + path + "/" + file + " returned an error: " + code + "\n" + signal + "\n" + error + "\n";
+          console.error(error);
+          return moveCorrupt(path, file).then(function() {
+            return reject(error);
+          });
         }
         return mkdirPromise(path + "/raw").then(function() {
           fs.rename(path + "/" + file, path + "/raw/" + file, function(err) {