diff --git a/packages/server/src/integrations/s3.ts b/packages/server/src/integrations/s3.ts
index 43aa04de6a..eb3605af8f 100644
--- a/packages/server/src/integrations/s3.ts
+++ b/packages/server/src/integrations/s3.ts
@@ -130,14 +130,25 @@ module S3Module {
         })
         .createReadStream()
 
-      return new Promise((resolve, reject) => {
-        stream
-          .on("error", (err: Error) => {
-            reject(err)
-          })
-          .on("finish", async () => {
-            resolve(csv().fromStream(stream))
+      let csvError = false
+      return new Promise(async (resolve, reject) => {
+        stream.on("error", (err: Error) => {
+          reject(err)
+        })
+        const response = csv()
+          .fromStream(stream)
+          .on("error", () => {
+            csvError = true
           })
+        stream.on("finish", () => {
+          resolve(response)
+        })
+      }).catch(err => {
+        if (csvError) {
+          throw new Error("Could not read CSV")
+        } else {
+          throw err
+        }
       })
     }
   }