diff --git a/dAuthServer/AuthServer.cpp b/dAuthServer/AuthServer.cpp
index c7f51487..fef3124b 100644
--- a/dAuthServer/AuthServer.cpp
+++ b/dAuthServer/AuthServer.cpp
@@ -147,7 +147,8 @@ int main(int argc, char** argv) {
 	delete Game::server;
 	delete Game::logger;
 
-	return 0;
+	exit(EXIT_SUCCESS);
+	return EXIT_SUCCESS;
 }
 
 dLogger * SetupLogger() {
diff --git a/dChatServer/ChatServer.cpp b/dChatServer/ChatServer.cpp
index 7835737f..9ba3ba1b 100644
--- a/dChatServer/ChatServer.cpp
+++ b/dChatServer/ChatServer.cpp
@@ -154,7 +154,8 @@ int main(int argc, char** argv) {
 	delete Game::server;
 	delete Game::logger;
 
-	return 0;
+	exit(EXIT_SUCCESS);
+	return EXIT_SUCCESS;
 }
 
 dLogger * SetupLogger() {
diff --git a/dMasterServer/MasterServer.cpp b/dMasterServer/MasterServer.cpp
index 2fbee693..959d5b99 100644
--- a/dMasterServer/MasterServer.cpp
+++ b/dMasterServer/MasterServer.cpp
@@ -320,7 +320,8 @@ int main(int argc, char** argv) {
 		std::this_thread::sleep_until(t);
 	}
 	FinalizeShutdown();
-	exit(0);
+	exit(EXIT_SUCCESS);
+	return EXIT_SUCCESS;
 }
 
 dLogger* SetupLogger() {
@@ -740,7 +741,7 @@ void ShutdownSequence() {
 	auto ticks = 0;
 
 	if (!Game::im) {
-		exit(0);
+		exit(EXIT_SUCCESS);
 	}
 
 	Game::logger->Log("MasterServer", "Attempting to shutdown instances, max 60 seconds...\n");
@@ -792,5 +793,6 @@ int FinalizeShutdown() {
 	delete Game::server;
 	delete Game::logger;
 
-	exit(0);
+	exit(EXIT_SUCCESS);
+	return EXIT_SUCCESS;
 }
\ No newline at end of file