diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 810713f653c..ca1e5d4dd17 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -1455,9 +1455,13 @@ nsWebShell::OnLinkClick(nsIFrame* aFrame,
 nsIWebShell*
 nsWebShell::GetTarget(const PRUnichar* aName)
 {
-  nsString name(aName);
+  nsAutoString name(aName);
   nsIWebShell* target = nsnull;
 
+  if (0 == name.Length()) {
+    return this;
+  }
+  
   if (name.EqualsIgnoreCase("_blank")) {
     nsIWebShell *shell;
     if (NS_OK == NewWebShell(shell))
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 810713f653c..ca1e5d4dd17 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -1455,9 +1455,13 @@ nsWebShell::OnLinkClick(nsIFrame* aFrame,
 nsIWebShell*
 nsWebShell::GetTarget(const PRUnichar* aName)
 {
-  nsString name(aName);
+  nsAutoString name(aName);
   nsIWebShell* target = nsnull;
 
+  if (0 == name.Length()) {
+    return this;
+  }
+  
   if (name.EqualsIgnoreCase("_blank")) {
     nsIWebShell *shell;
     if (NS_OK == NewWebShell(shell))