diff --git a/mozilla/docshell/base/Makefile.in b/mozilla/docshell/base/Makefile.in
index 4ff0b362459..78c0233c719 100644
--- a/mozilla/docshell/base/Makefile.in
+++ b/mozilla/docshell/base/Makefile.in
@@ -54,7 +54,7 @@ REQUIRES	= xpcom \
 		  webshell \
 		  chardet \
 		  uconv \
-		  appcomps \
+		  history \
 		  xuldoc \
 		  find \
 		  nkcache \
diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 671608fb48e..6de9527158a 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -709,19 +709,20 @@ nsWebShell::GetLinkState(const nsACString& aLinkURI, nsLinkState& aState)
   nsresult rv;
     
   // get the cached IO service
-  if (!mIOService)
-    mIOService = do_GetService(NS_IOSERVICE_CONTRACTID);
+  if (!mIOService) {
+    mIOService = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
+        
+    if (NS_SUCCEEDED(rv)) {
 
-  if (mIOService) {
+      // clean up the url using the right parser
+      nsCOMPtr<nsIURI> uri;
+      rv = NS_NewURI(getter_AddRefs(uri), aLinkURI, nsnull, nsnull,
+                     mIOService);
 
-    // clean up the url using the right parser
-    nsCOMPtr<nsIURI> uri;
-    rv = NS_NewURI(getter_AddRefs(uri), aLinkURI, nsnull, nsnull,
-                   mIOService);
-
-    // now get the fully canonicalized path
-    if (NS_SUCCEEDED(rv))
-      rv = uri->GetSpec(resolvedPath);
+      // now get the fully canonicalized path
+      if (NS_SUCCEEDED(rv))
+        rv = uri->GetSpec(resolvedPath);
+    }
   }
   
   PRBool isVisited;