Merge branch 'master' into zach-starter

1 files changed, 4 insertions, 5 deletions

diff --git a/src/client/util/request-image-size.ts b/src/client/util/request-image-size.ts
index 7a2ecd486..c619192ed 100644
--- a/src/client/util/request-image-size.ts
+++ b/src/client/util/request-image-size.ts
@@ -35,7 +35,11 @@ module.exports = function requestImageSize(url: string) {
 
             res.on('data', chunk => {
                 buffer = Buffer.concat([buffer, chunk]);
+            });
+
+            res.on('error', reject);
 
+            res.on('end', () => {
                 try {
                     size = imageSize(buffer);
                     if (size) {
@@ -46,11 +50,6 @@ module.exports = function requestImageSize(url: string) {
                     /* empty */
                     console.log('Error: ', err);
                 }
-            });
-
-            res.on('error', reject);
-
-            res.on('end', () => {
                 if (!size) {
                     reject(new Error('Image has no size'));
                     return;