diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 607d8924b22..97598c4bb0a 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -1001,8 +1001,11 @@ nsWebShell::OnEndDocumentLoad(nsIDocumentLoader* loader, aStatus == NS_ERROR_NET_TIMEOUT) { PRBool keywordsEnabled = PR_FALSE; - NS_ENSURE_SUCCESS(mPrefs->GetBoolPref("keyword.enabled", &keywordsEnabled), - NS_ERROR_FAILURE); + if(mPrefs) + { + NS_ENSURE_SUCCESS(mPrefs->GetBoolPref("keyword.enabled", &keywordsEnabled), + NS_ERROR_FAILURE); + } // we should only perform a keyword search under the following conditions: // (0) Pref keyword.enabled is true