diff --git a/mozilla/toolkit/xre/nsAppRunner.cpp b/mozilla/toolkit/xre/nsAppRunner.cpp
index 55aba811a21..73dd20cd9ab 100644
--- a/mozilla/toolkit/xre/nsAppRunner.cpp
+++ b/mozilla/toolkit/xre/nsAppRunner.cpp
@@ -1472,6 +1472,9 @@ static int HandleRemoteArguments(int argc, char* argv[], PRBool *aArgUsed)
     }
   }
 
+  if (!remote)
+    return 0; // No remote argument == success
+
   // try to get the X remote client
   nsCOMPtr<nsIXRemoteClient> client (do_CreateInstance(NS_XREMOTECLIENT_CONTRACTID));
   if (!client)
diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
index 594d33ed426..d50326da4d4 100644
--- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp
+++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp
@@ -1469,6 +1469,9 @@ static int HandleRemoteArguments(int argc, char* argv[], PRBool *aArgUsed)
     }
   }
 
+  if (!remote)
+    return 0; // No remote argument == success
+
   // try to get the X remote client
   nsCOMPtr<nsIXRemoteClient> client (do_CreateInstance(NS_XREMOTECLIENT_CONTRACTID));
   if (!client)