diff --git a/content/base/src/nsFrameLoader.cpp b/content/base/src/nsFrameLoader.cpp
index 9275189bdae8..c1fe6e04aed1 100644
--- a/content/base/src/nsFrameLoader.cpp
+++ b/content/base/src/nsFrameLoader.cpp
@@ -89,6 +89,7 @@ public:
     if (base_win) {
       base_win->Destroy();
     }
+    return NS_OK;
   }
   nsRefPtr<nsIDocShell> mDocShell;
 };
diff --git a/content/base/src/nsFrameLoader.h b/content/base/src/nsFrameLoader.h
index beb522f3c415..5036559f4c68 100755
--- a/content/base/src/nsFrameLoader.h
+++ b/content/base/src/nsFrameLoader.h
@@ -62,16 +62,17 @@ public:
     mInDestructor(PR_FALSE)
   {}
 
+  ~nsFrameLoader() {
+    mInDestructor = PR_TRUE;
+    nsFrameLoader::Destroy();
+  }
+
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS(nsFrameLoader)
   NS_DECL_NSIFRAMELOADER
   NS_HIDDEN_(nsresult) CheckForRecursiveLoad(nsIURI* aURI);
   void Finalize();
 private:
-  ~nsFrameLoader() {
-    mInDestructor = PR_TRUE;
-    nsFrameLoader::Destroy();
-  }
 
   NS_HIDDEN_(nsresult) EnsureDocShell();
   NS_HIDDEN_(void) GetURL(nsString& aURL);