Merge branch 'master' into temporalmedia-mehek

1 files changed, 17 insertions, 12 deletions

diff --git a/src/server/DashUploadUtils.ts b/src/server/DashUploadUtils.ts
index 549dc0396..7b83d09ef 100644
--- a/src/server/DashUploadUtils.ts
+++ b/src/server/DashUploadUtils.ts
@@ -242,18 +242,23 @@ export namespace DashUploadUtils {
         const { headers } = (await new Promise<any>((resolve, reject) => {
             request.head(resolvedUrl, (error, res) => error ? reject(error) : resolve(res));
         }).catch(error => console.error(error)));
-        // Compute the native width and height ofthe image with an npm module
-        const { width: nativeWidth, height: nativeHeight }: RequestedImageSize = await requestImageSize(resolvedUrl);
-        // Bundle up the information into an object
-        return {
-            source,
-            contentSize: parseInt(headers[size]),
-            contentType: headers[type],
-            nativeWidth,
-            nativeHeight,
-            filename,
-            ...results
-        };
+        try {
+            // Compute the native width and height ofthe image with an npm module
+            const { width: nativeWidth, height: nativeHeight } = await requestImageSize(resolvedUrl);
+            // Bundle up the information into an object
+            return {
+                source,
+                contentSize: parseInt(headers[size]),
+                contentType: headers[type],
+                nativeWidth,
+                nativeHeight,
+                filename,
+                ...results
+            };
+        } catch (e) {
+            console.log(e);
+            return e;
+        }
     };
 
     /**