diff --git a/src/chrome/content/rules/Fastly.net.xml b/src/chrome/content/rules/Fastly.net.xml
index b2bbf1c377ff..fbbca8dc3364 100644
--- a/src/chrome/content/rules/Fastly.net.xml
+++ b/src/chrome/content/rules/Fastly.net.xml
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml
index e1d085cefca2..a36b70eebd1c 100644
--- a/src/chrome/content/rules/Mozilla.xml
+++ b/src/chrome/content/rules/Mozilla.xml
@@ -227,7 +227,7 @@
https://mail1.eff.org/pipermail/https-everywhere-rules/2013-June/001635.html
-->
-
+
@@ -253,6 +253,7 @@
+
diff --git a/src/chrome/content/rules/Next.xml b/src/chrome/content/rules/Next.xml
index 959c1a3a734c..b9bde5a03bbf 100644
--- a/src/chrome/content/rules/Next.xml
+++ b/src/chrome/content/rules/Next.xml
@@ -1,4 +1,7 @@
-
+
+
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
index 33eec3a3ecd3..81f6ad6703c2 100644
--- a/src/components/https-everywhere.js
+++ b/src/components/https-everywhere.js
@@ -361,7 +361,7 @@ HTTPSEverywhere.prototype = {
.getInterface(Ci.nsIDOMWindow);
// this is the gBrowser object of the firefox window this tab is in
var gBrowser = aDOMWindow.gBrowser;
- if (gBrowser) {
+ if (gBrowser && gBrowser._getTabForContentWindow) {
var aTab = gBrowser._getTabForContentWindow(contentWindow.top);
// this is the clickable tab xul element, the one found in the tab strip
// of the firefox window, aTab.linkedBrowser is same as browser var above