diff --git a/mozilla/layout/base/src/nsFrame.cpp b/mozilla/layout/base/src/nsFrame.cpp
index dd71d169d57..d7f69decff2 100644
--- a/mozilla/layout/base/src/nsFrame.cpp
+++ b/mozilla/layout/base/src/nsFrame.cpp
@@ -532,12 +532,14 @@ NS_METHOD nsFrame::HandleEvent(nsIPresContext& aPresContext,
 {
   aEventStatus = nsEventStatus_eIgnore;
   
-  nsIEventStateManager *mManager;
-  if (NS_OK == aPresContext.GetEventStateManager(&mManager)) {
-    mManager->SetEventTarget((nsISupports*)mContent);
-    NS_RELEASE(mManager);
+  if (nsnull != mContent) {
+    nsIEventStateManager *mManager;
+    if (NS_OK == aPresContext.GetEventStateManager(&mManager)) {
+      mManager->SetEventTarget((nsISupports*)mContent);
+      NS_RELEASE(mManager);
+    }
+    mContent->HandleDOMEvent(aPresContext, aEvent, nsnull, aEventStatus);
   }
-  mContent->HandleDOMEvent(aPresContext, aEvent, nsnull, aEventStatus);
 
 #if DO_SELECTION