diff --git a/builds/gdc.xpi b/builds/gdc.xpi
index ec216f9..2bc2ef2 100644
Binary files a/builds/gdc.xpi and b/builds/gdc.xpi differ
diff --git a/firefox/components/policy.js b/firefox/components/policy.js
index 627f201..6d8bbb7 100644
--- a/firefox/components/policy.js
+++ b/firefox/components/policy.js
@@ -147,20 +147,26 @@ GoogleDisconnect.prototype = {
     var domains = this.domains;
     var result = accept;
 
-    if (
-      contentType != contentPolicy.TYPE_DOCUMENT && // The MIME type.
-          requestOrigin && requestOrigin.asciiHost &&
-              !isMatching(requestOrigin.host, domains) && // The whitelist.
-                  contentLocation.asciiHost &&
-                      isMatching(contentLocation.host, domains)
-                          // The blacklist.
-    ) {
+    if (context) {
       var html = context.ownerDocument;
-      var googleRequestCount = html.googleRequestCount;
-      html.googleRequestCount =
-          typeof googleRequestCount == 'undefined' ? 1 : ++googleRequestCount;
-      if (!JSON.parse(html.defaultView.content.localStorage.googleUnblocked))
-          result = contentPolicy.REJECT_SERVER; // The blocking state.
+      var content = html.defaultView.content;
+
+      if (
+        contentType != contentPolicy.TYPE_DOCUMENT && // The MIME type.
+            requestOrigin && requestOrigin.asciiHost &&
+                !isMatching(requestOrigin.host, domains) &&
+                    !isMatching(content.top.location.hostname, domains) &&
+                        // The whitelist.
+                            contentLocation.asciiHost &&
+                                isMatching(contentLocation.host, domains)
+                                    // The blacklist.
+      ) {
+        var googleRequestCount = html.googleRequestCount;
+        html.googleRequestCount =
+            typeof googleRequestCount == 'undefined' ? 1 : ++googleRequestCount;
+        if (!JSON.parse(content.localStorage.googleUnblocked))
+            result = contentPolicy.REJECT_SERVER; // The blocking state.
+      }
     }
 
     return result;
diff --git a/firefox/install.rdf b/firefox/install.rdf
index 3490d83..56130a9 100644
--- a/firefox/install.rdf
+++ b/firefox/install.rdf
@@ -28,7 +28,7 @@
     <em:type>2</em:type><!-- An extension. -->
     <em:id>google@disconnect.me</em:id>
     <em:name>Google Disconnect</em:name>
-    <em:version>2.3.0</em:version>
+    <em:version>2.3.1</em:version>
     <em:creator>Disconnect</em:creator>
     <em:developer>Brian Kennish</em:developer>
     <em:developer>Gary Teh</em:developer>