Suppress errors when a frame receives an extension message before ini…

…tialization
Qwokka · Sep 23, 2023 · 373c690 · 373c690
1 parent 9d8d5df
commit 373c690
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/content/cetus.js b/content/cetus.js
@@ -865,8 +865,16 @@ window.addEventListener("cetusMsgOut", function(msgRaw) {
     if (typeof msgType !== "string") {
         return;
     }
-
-    const cetus = cetusInstances.get(msg.id);
+
+    let cetus;
+
+    try {
+        cetus = cetusInstances.get(msg.id);
+    } catch (e) {
+        // Since extension messages are sent to all frames, there's a good chance a frame will get a message without Cetus being
+        // initialized. In this case, we just drop the message
+        return;
+    }
 
     if (typeof cetus === "undefined") {
         return;