From 4e212d12b274ab8f273aa37d6870d1277270e8f5 Mon Sep 17 00:00:00 2001
From: John McLear <john@mclear.co.uk>
Date: Fri, 3 Apr 2020 10:30:12 +0000
Subject: [PATCH] patch fix for 3825

---
 src/node/handler/ImportHandler.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/node/handler/ImportHandler.js b/src/node/handler/ImportHandler.js
index 17b306595..929b5c6db 100644
--- a/src/node/handler/ImportHandler.js
+++ b/src/node/handler/ImportHandler.js
@@ -83,7 +83,11 @@ async function doImport(req, res, padId)
         }
         reject("uploadFailed");
       }
-      resolve(files.file.path);
+      if(!files.file){ // might not be a graceful fix but it works
+        reject("uploadFailed");
+      }else{
+        resolve(files.file.path);
+      }
     });
   });
 
@@ -148,6 +152,9 @@ async function doImport(req, res, padId)
     } else {
       // @TODO - no Promise interface for convertors (yet)
       await new Promise((resolve, reject) => {
+        // Why are we running convertFile if it's been rejected?
+        console.warn("john debug", reject);
+
         convertor.convertFile(srcFile, destFile, exportExtension, function(err) {
           // catch convert errors
           if (err) {