--- a/mailnews/base/src/nsMsgContentPolicy.cpp
+++ b/mailnews/base/src/nsMsgContentPolicy.cpp
@@ -307,31 +307,25 @@ nsMsgContentPolicy::ShouldLoad(nsIURI* a
   rv = aLoadInfo->GetTargetBrowsingContext(getter_AddRefs(targetContext));
   NS_ENSURE_SUCCESS(rv, NS_OK);
 
   if (!targetContext) {
     *aDecision = nsIContentPolicy::ACCEPT;
     return NS_OK;
   }
 
+  nsCOMPtr<nsIURI> originatorLocation;
   dom::CanonicalBrowsingContext* cbc = targetContext->Canonical();
-  if (!cbc) {
-    *aDecision = nsIContentPolicy::ACCEPT;
-    return NS_OK;
+  if (cbc) {
+    dom::WindowGlobalParent* wgp = cbc->GetCurrentWindowGlobal();
+    if (wgp) {
+      originatorLocation = wgp->GetDocumentURI();
+    }
   }
-
-  dom::WindowGlobalParent* wgp = cbc->GetCurrentWindowGlobal();
-  if (!wgp) {
-    *aDecision = nsIContentPolicy::ACCEPT;
-    return NS_OK;
-  }
-
-  nsCOMPtr<nsIURI> originatorLocation = wgp->GetDocumentURI();
   if (!originatorLocation) {
-    *aDecision = nsIContentPolicy::ACCEPT;
     return NS_OK;
   }
 
 #ifdef DEBUG_MsgContentPolicy
   fprintf(stderr, "originatorLocation = %s\n",
           originatorLocation->GetSpecOrDefault().get());
 #endif