diff --git a/server/core/FileDecompressor.js b/server/core/FileDecompressor.js
index ad4cf7b8..7b7c68fc 100644
--- a/server/core/FileDecompressor.js
+++ b/server/core/FileDecompressor.js
@@ -112,7 +112,7 @@ class FileDecompressor {
 
     async unZip(filename, outputDir) {
         const zip = new ZipStreamer();
-        return await await zip.unpack(filename, outputDir);
+        return await zip.unpack(filename, outputDir);
     }
 
     unBz2(filename, outputDir) {
diff --git a/server/core/ZipStreamer.js b/server/core/ZipStreamer.js
index 50eec0c7..03f59ff5 100644
--- a/server/core/ZipStreamer.js
+++ b/server/core/ZipStreamer.js
@@ -57,6 +57,8 @@ class ZipStreamer {
             entryCallback = (entryCallback ? entryCallback : () => {});
             const unzip = new unzipStream({file: zipFile});
 
+            unzip.on('error', reject);
+
             let files = [];
             unzip.on('extract', (en) => {
                 const entry = {path: en.name, size: en.size, compressedSize: en.compressedSize};