diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp
index 8a7ed48b2..e717d20be 100644
--- a/src/cpp/ripple/main.cpp
+++ b/src/cpp/ripple/main.cpp
@@ -188,8 +188,17 @@ int main(int argc, char* argv[])
 		}
 	}
 
+	if (iResult)
+	{
+		nothing();
+	}
+	else if (vm.count("help"))
+	{
+		iResult	= 1;
+	}
+
 	if (HaveSustain() &&
-		!vm.count("parameters") && !vm.count("fg") && !vm.count("standalone") && !vm.count("unittest"))
+		!iResult && !vm.count("parameters") && !vm.count("fg") && !vm.count("standalone") && !vm.count("unittest"))
 	{
 		std::string logMe = DoSustain();
 		if (!logMe.empty())
@@ -251,10 +260,6 @@ int main(int argc, char* argv[])
 	{
 		nothing();
 	}
-	else if (vm.count("help"))
-	{
-		iResult	= 1;
-	}
 	else if (!vm.count("parameters"))
 	{
 		// No arguments. Run server.