diff --git a/https-everywhere-tests/test_profile_skeleton/prefs.js b/https-everywhere-tests/test_profile_skeleton/prefs.js
index 9f0e5ddd5928..fbe6514614e8 100644
--- a/https-everywhere-tests/test_profile_skeleton/prefs.js
+++ b/https-everywhere-tests/test_profile_skeleton/prefs.js
@@ -13,6 +13,9 @@ user_pref("general.warnOnAboutConfig", false);
 // Minimize unnecesary requests.
 user_pref("browser.safebrowsing.enabled", false);
 user_pref("browser.safebrowsing.malware.enabled", false);
-// Enable browser debugging in test mode.
-user_pref("devtools.debugger.remote-enabled", true);
+// These two preferences allow debugging the extension
+// using Tools > Web Developer > Browser Toolbox
+// (Note: Since this is not an SDK extension, you can't use the Addon
+// Debugger, but the Browser Toolbox is just about as good).
 user_pref("devtools.chrome.enabled", true);
+user_pref("devtools.debugger.remote-enabled", true);
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
index 0a9eee18b45a..454ce50b11d6 100644
--- a/src/components/ssl-observatory.js
+++ b/src/components/ssl-observatory.js
@@ -618,7 +618,13 @@ SSLObservatory.prototype = {
     var HTTPSEverywhere = CC["@eff.org/https-everywhere;1"]
                             .getService(Components.interfaces.nsISupports)
                             .wrappedJSObject;
-    var win = channel ? HTTPSEverywhere.getWindowForChannel(channel) : null;
+    var win = null;
+    if (channel) {
+      var browser = this.HTTPSEverywhere.getBrowserForChannel(channel);
+      if (browser) {
+        var win = browser.contentWindow;
+      }
+    }
     var req = this.buildRequest(params);
     req.timeout = TIMEOUT;