From 19527c9c2b85dd53bdefedcd3f253ebcf7d2f3f4 Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Tue, 18 Oct 2022 11:51:01 +1100
Subject: [PATCH] Improved error handling

---
 src/drivers/webextension/js/driver.js     |  4 +---
 src/drivers/webextension/js/lib/iframe.js | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js
index d51a9d526..bc8bfebb5 100644
--- a/src/drivers/webextension/js/driver.js
+++ b/src/drivers/webextension/js/driver.js
@@ -666,7 +666,7 @@ const Driver = {
     ]
 
     try {
-      Driver.content(url, 'analyzeRequires', [url, requires])
+      await Driver.content(url, 'analyzeRequires', [url, requires])
     } catch (error) {
       // Continue
     }
@@ -788,8 +788,6 @@ const Driver = {
       return
     }
 
-    console.log({ tab })
-
     const { id, url } = tab
 
     if (await Driver.isDisabledDomain(url)) {
diff --git a/src/drivers/webextension/js/lib/iframe.js b/src/drivers/webextension/js/lib/iframe.js
index eb910cc93..c883e4ffb 100644
--- a/src/drivers/webextension/js/lib/iframe.js
+++ b/src/drivers/webextension/js/lib/iframe.js
@@ -1,4 +1,6 @@
 'use strict'
+/* eslint-env browser */
+/* globals chrome */
 ;(function (win) {
   const exports = {}
 
@@ -163,15 +165,19 @@
        * @param {String} responseMessage
        */
       sendToBackground(message, event, responseMessage) {
-        chrome.runtime.sendMessage(message, (message) => {
-          if (message && typeof message.tracking_enabled !== 'undefined') {
-            if (message.tracking_enabled) {
-              utilCallback()
-            } else {
-              utilElseCallback()
+        try {
+          chrome.runtime.sendMessage(message, (message) => {
+            if (message && typeof message.tracking_enabled !== 'undefined') {
+              if (message.tracking_enabled) {
+                utilCallback()
+              } else {
+                utilElseCallback()
+              }
             }
-          }
-        })
+          })
+        } catch (error) {
+          // Continue
+        }
       },
 
       /**