1 files changed, 6 insertions, 1 deletions
diff --git a/ext/js/comm/frame-client.js b/ext/js/comm/frame-client.js
index d15cee30..c74a9913 100644
--- a/ext/js/comm/frame-client.js
+++ b/ext/js/comm/frame-client.js
@@ -156,7 +156,12 @@ class FrameClient {
             // Prevent unhandled rejections
             frameLoadedPromise.catch(() => {}); // NOP
 
-            setupFrame(frame);
+            try {
+                setupFrame(frame);
+            } catch (e) {
+                cleanup();
+                reject(e);
+            }
         });
     }