diff --git a/mozilla/browser/base/content/tabbrowser.xml b/mozilla/browser/base/content/tabbrowser.xml
index b696262ce97..5e07ebe4868 100644
--- a/mozilla/browser/base/content/tabbrowser.xml
+++ b/mozilla/browser/base/content/tabbrowser.xml
@@ -708,7 +708,8 @@
             }
 
             var updatePageReport = false;
-            if ((this.mCurrentBrowser.pageReport && !newBrowser.pageReport) ||
+            if (!this.mCurrentBrowser ||
+                (this.mCurrentBrowser.pageReport && !newBrowser.pageReport) ||
                 (!this.mCurrentBrowser.pageReport && newBrowser.pageReport))
               updatePageReport = true;
 
@@ -1432,6 +1433,9 @@
             // reset by updateCurrentBrowser.
             oldBrowser.destroy();
 
+            if (oldBrowser == this.mCurrentBrowser)
+              this.mCurrentBrowser = null;
+
             // Remove the tab
             this.mTabContainer.removeChild(oldTab);
             // invalidate cache, because mTabContainer is about to change