diff --git a/mozilla/docshell/base/nsDefaultURIFixup.cpp b/mozilla/docshell/base/nsDefaultURIFixup.cpp
index 1000b4b6a3e..c0de0700620 100644
--- a/mozilla/docshell/base/nsDefaultURIFixup.cpp
+++ b/mozilla/docshell/base/nsDefaultURIFixup.cpp
@@ -253,6 +253,10 @@ nsDefaultURIFixup::CreateFixupURI(const nsACString& aStringURI, PRUint32 aFixupF
         // Just try to create an URL out of it
         rv = NS_NewURI(aURI, uriString,
                        bUseNonDefaultCharsetForURI ? GetCharsetForUrlBar() : nsnull);
+
+        if (!*aURI && rv != NS_ERROR_MALFORMED_URI) {
+            return rv;
+        }
     }
     
     if (*aURI) {