3 files changed, 24 insertions, 26 deletions
diff --git a/src/client/Network.ts b/src/client/Network.ts
index a2ecf1bea..b11dcb379 100644
--- a/src/client/Network.ts
+++ b/src/client/Network.ts
@@ -21,10 +21,10 @@ export namespace Networking {
                 'Content-Type': 'application/json',
             },
             body: body ? JSON.stringify(body) : undefined,
-        }).then(async response => {
+        }).then(response => {
             if (response.ok) return response.json() as object;
 
-            return await response.text().then(text => ({ error: '' + response.status + ':' + response.statusText + '-' + text }));
+            return response.text().then(text => ({ error: '' + response.status + ':' + response.statusText + '-' + text }));
         });
     }
 
diff --git a/src/client/util/request-image-size.ts b/src/client/util/request-image-size.ts
index 32ab23618..798390c7d 100644
--- a/src/client/util/request-image-size.ts
+++ b/src/client/util/request-image-size.ts
@@ -33,27 +33,25 @@ export function requestImageSize(url: string): Promise<ISizeCalculationResult> {
 
             res.on('data', chunk => {
                 buffer = Buffer.concat([buffer, chunk]);
-            });
-
-            res.on('error', reject);
-
-            res.on('end', () => {
-                try {
-                    size = imageSize(buffer);
-                    if (size) {
-                        resolve(size);
-                        req.abort();
+            })
+                .on('error', reject)
+                .on('end', () => {
+                    try {
+                        size = imageSize(buffer);
+                        if (size) {
+                            resolve(size);
+                            req.abort();
+                        }
+                    } catch (err) {
+                        /* empty */
+                        console.log('Error: ', err);
+                    }
+                    if (!size) {
+                        reject(new Error('Image has no size'));
+                        return;
                     }
-                } catch (err) {
-                    /* empty */
-                    console.log('Error: ', err);
-                }
-                if (!size) {
-                    reject(new Error('Image has no size'));
-                    return;
-                }
-                resolve(size);
-            });
+                    resolve(size);
+                });
         });
 
         req.on('error', reject);
diff --git a/src/client/views/smartdraw/DrawingFillHandler.tsx b/src/client/views/smartdraw/DrawingFillHandler.tsx
index a91ec23b8..b0945fd83 100644
--- a/src/client/views/smartdraw/DrawingFillHandler.tsx
+++ b/src/client/views/smartdraw/DrawingFillHandler.tsx
@@ -26,11 +26,12 @@ export class DrawingFillHandler {
         const styleUrl = tags.length
             ? undefined
             : await DocumentView.GetDocImage(styleDocs.filter(doc => doc?.data instanceof ImageField).lastElement())?.then(styleImg => {
-                  const hrefParts = ImageCast(styleImg).url.href.split('.');
-                  return `${hrefParts.slice(0, -1).join('.')}_o.${hrefParts.lastElement()}`;
+                  const hrefParts = ImageCast(styleImg)?.url.href.split('.');
+                  return !hrefParts ? undefined : `${hrefParts.slice(0, -1).join('.')}_o.${hrefParts.lastElement()}`;
               });
         return DocumentView.GetDocImage(drawing)?.then(imageField => {
-            if (imageField) {
+            const href = ImageCast(imageField)?.url.href;
+            if (href) {
                 const aspectRatio = (drawing.width as number) / (drawing.height as number);
                 const dims = (() => {
                     if (aspectRatio > AspectRatioLimits[FireflyImageDimensions.Widescreen]) return FireflyDimensionsMap[FireflyImageDimensions.Widescreen];
@@ -38,7 +39,6 @@ export class DrawingFillHandler {
                     if (aspectRatio < AspectRatioLimits[FireflyImageDimensions.Portrait]) return FireflyDimensionsMap[FireflyImageDimensions.Portrait];
                     return FireflyDimensionsMap[FireflyImageDimensions.Square];
                 })();
-                const { href } = ImageCast(imageField).url;
                 const hrefParts = href.split('.');
                 const structureUrl = `${hrefParts.slice(0, -1).join('.')}_o.${hrefParts.lastElement()}`;
                 return gptDescribeImage(user_prompt, structureUrl).then(newPrompt =>