diff --git a/common/cli/eqemu_command_handler.cpp b/common/cli/eqemu_command_handler.cpp
index d803d35d4..3162d400a 100644
--- a/common/cli/eqemu_command_handler.cpp
+++ b/common/cli/eqemu_command_handler.cpp
@@ -77,7 +77,7 @@ namespace EQEmuCommand {
 			index++;
 		}
 
-		if (!arguments_filled || argc == 2) {
+		if (!arguments_filled || argc == 2 || cmd[{"-h", "--help"}]) {
 			std::string arguments_string;
 			for (auto &arg : arguments) {
 				arguments_string += " " + arg;
@@ -101,7 +101,7 @@ namespace EQEmuCommand {
 
 			std::cout << command_string.str() << std::endl;
 
-			exit(1);
+			exit(0);
 		}
 	}
 
@@ -188,11 +188,11 @@ namespace EQEmuCommand {
 
 			std::cout << std::endl;
 
-			std::exit(1);
+			std::exit(0);
 		}
 
 		if (ran_command) {
-			std::exit(1);
+			std::exit(0);
 		}
 	}
 
diff --git a/world/world_server_command_handler.cpp b/world/world_server_command_handler.cpp
index 169c2c0bc..b588577a4 100644
--- a/world/world_server_command_handler.cpp
+++ b/world/world_server_command_handler.cpp
@@ -223,10 +223,6 @@ namespace WorldserverCommandHandler {
 	{
 		description = "Dumps server database tables";
 
-		if (cmd[{"-h", "--help"}]) {
-			return;
-		}
-
 		std::vector<std::string> arguments = {};
 		std::vector<std::string> options   = {
 			"--all",
@@ -245,7 +241,7 @@ namespace WorldserverCommandHandler {
 		};
 
 
-		if (argc < 3) {
+		if (argc < 3 || cmd[{"-h", "--help"}]) {
 			EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
 			return;
 		}