diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp
index 393c9e7994d..d9a84b980ec 100644
--- a/mozilla/layout/generic/nsObjectFrame.cpp
+++ b/mozilla/layout/generic/nsObjectFrame.cpp
@@ -803,13 +803,14 @@ NS_IMETHODIMP nsPluginInstanceOwner :: GetURL(const char *aURL, const char *aTar
           nsIURL        *docURL = doc->GetDocumentURL();
 
           // Create an absolute URL
-          nsresult rv = NS_MakeAbsoluteURL(docURL, base, uniurl, fullurl);
+          rv = NS_MakeAbsoluteURL(docURL, base, uniurl, fullurl);
 
           NS_RELEASE(shell);
           NS_RELEASE(docURL);
           NS_RELEASE(doc);
 
-          rv = lh->OnLinkClick(mOwner, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull);
+          if (NS_OK == rv)
+            rv = lh->OnLinkClick(mOwner, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull);
 
           NS_RELEASE(lh);
         }
diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp
index 393c9e7994d..d9a84b980ec 100644
--- a/mozilla/layout/html/base/src/nsObjectFrame.cpp
+++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp
@@ -803,13 +803,14 @@ NS_IMETHODIMP nsPluginInstanceOwner :: GetURL(const char *aURL, const char *aTar
           nsIURL        *docURL = doc->GetDocumentURL();
 
           // Create an absolute URL
-          nsresult rv = NS_MakeAbsoluteURL(docURL, base, uniurl, fullurl);
+          rv = NS_MakeAbsoluteURL(docURL, base, uniurl, fullurl);
 
           NS_RELEASE(shell);
           NS_RELEASE(docURL);
           NS_RELEASE(doc);
 
-          rv = lh->OnLinkClick(mOwner, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull);
+          if (NS_OK == rv)
+            rv = lh->OnLinkClick(mOwner, fullurl.GetUnicode(), unitarget.GetUnicode(), nsnull);
 
           NS_RELEASE(lh);
         }