diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 9d7690abc11..b6edceefa3d 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -2748,6 +2748,9 @@ NS_IMETHODIMP nsDocShell::ShouldAddToGlobalHistory(nsIURI* aURI,
 
 NS_IMETHODIMP nsDocShell::AddToGlobalHistory(nsIURI* aURI)
 {
+   if(NS_FAILED(EnsureGlobalHistory()))
+      return NS_ERROR_FAILURE;  // XXX REMOVE THIS!!!!
+
    NS_ENSURE_SUCCESS(EnsureGlobalHistory(), NS_ERROR_FAILURE);
 
    nsXPIDLCString spec;