diff --git a/Makefile b/Makefile
index 7da69ef..fda0413 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ upload-deb:
 fmt:
 	cleancss -O1 all -O2 all --format beautify home.css -o .home.css && mv .home.css home.css
 	cleancss -O1 all -O2 all --format beautify info.css -o .info.css && mv .info.css info.css
-	find . -path ./node_modules -prune -o -name '*.js*' -exec prettier --write {} \;
+	find . -path ./node_modules -prune -o -name '*.js' -exec prettier --write {} \;
 
 lint:
 	eslint --color *.js
diff --git a/scrub.js b/scrub.js
index de25d92..7102237 100644
--- a/scrub.js
+++ b/scrub.js
@@ -53,6 +53,9 @@ var contextScrub = async function(requestDetails) {
         let context = await browser.contextualIdentities.get(
           tabInfo.cookieStoreId
         );
+        if (context == undefined) {
+          return "firefox-default";
+        }
         return context;
       } catch (error) {
         return "firefox-default";
@@ -101,6 +104,7 @@ var contextSetup = async function(requestDetails) {
         var context = await browser.contextualIdentities.query({
           name: titlepref
         });
+        console.log(context[0].cookieStoreId);
         if (tabId.cookieStoreId != context[0].cookieStoreId) {
           function Create(currentTab) {
             function onCreated(tab) {