diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index facbbaa56a3..e264b8a0fbd 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -1344,7 +1344,10 @@ nsresult nsObjectFrame::GetFullURL(nsIURI*& aFullURL)
 
 nsresult nsObjectFrame::GetPluginInstance(nsIPluginInstance*& aPluginInstance)
 {
-  return mInstanceOwner->GetInstance(aPluginInstance);
+  if(mInstanceOwner == nsnull)
+    return NS_ERROR_NULL_POINTER;
+  else
+    return mInstanceOwner->GetInstance(aPluginInstance);
 }
 
 nsresult
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index facbbaa56a3..e264b8a0fbd 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -1344,7 +1344,10 @@ nsresult nsObjectFrame::GetFullURL(nsIURI*& aFullURL)
 
 nsresult nsObjectFrame::GetPluginInstance(nsIPluginInstance*& aPluginInstance)
 {
-  return mInstanceOwner->GetInstance(aPluginInstance);
+  if(mInstanceOwner == nsnull)
+    return NS_ERROR_NULL_POINTER;
+  else
+    return mInstanceOwner->GetInstance(aPluginInstance);
 }
 
 nsresult