diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 99a47c13a15..97dd15e47ed 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -2266,13 +2266,11 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
   }
   
   //Capturing stage
-  if (NS_EVENT_FLAG_BUBBLE != aFlags) {
+  if (NS_EVENT_FLAG_BUBBLE != aFlags && nsnull != mScriptContextOwner) {
     nsIScriptGlobalObject* mGlobal;
-    if (mScriptContextOwner != nsnull) {
-	    if (NS_OK == mScriptContextOwner->GetScriptGlobalObject(&mGlobal)) {
-	      mGlobal->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
-	      NS_RELEASE(mGlobal);
-	    }
+    if (NS_OK == mScriptContextOwner->GetScriptGlobalObject(&mGlobal)) {
+      mGlobal->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
+      NS_RELEASE(mGlobal);
     }
   }
   
diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp
index 99a47c13a15..97dd15e47ed 100644
--- a/mozilla/layout/base/src/nsDocument.cpp
+++ b/mozilla/layout/base/src/nsDocument.cpp
@@ -2266,13 +2266,11 @@ nsresult nsDocument::HandleDOMEvent(nsIPresContext& aPresContext,
   }
   
   //Capturing stage
-  if (NS_EVENT_FLAG_BUBBLE != aFlags) {
+  if (NS_EVENT_FLAG_BUBBLE != aFlags && nsnull != mScriptContextOwner) {
     nsIScriptGlobalObject* mGlobal;
-    if (mScriptContextOwner != nsnull) {
-	    if (NS_OK == mScriptContextOwner->GetScriptGlobalObject(&mGlobal)) {
-	      mGlobal->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
-	      NS_RELEASE(mGlobal);
-	    }
+    if (NS_OK == mScriptContextOwner->GetScriptGlobalObject(&mGlobal)) {
+      mGlobal->HandleDOMEvent(aPresContext, aEvent, aDOMEvent, NS_EVENT_FLAG_CAPTURE, aEventStatus);
+      NS_RELEASE(mGlobal);
     }
   }