diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index ce6990697..f9cf7fbcd 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -3432,6 +3432,7 @@ int main(int argc, const char **argv) // ignore_convention
 {
 #endif
 	bool Silent = false;
+	bool IsRandFail = false;
 
 	for(int i = 1; i < argc; i++) // ignore_convention
 	{
@@ -3447,8 +3448,7 @@ int main(int argc, const char **argv) // ignore_convention
 
 	if(secure_random_init() != 0)
 	{
-		dbg_msg("secure", "could not initialize secure RNG");
-		return -1;
+		IsRandFail = true;
 	}
 
 	CClient *pClient = CreateClient();
@@ -3467,6 +3467,12 @@ int main(int argc, const char **argv) // ignore_convention
 	IEngineMap *pEngineMap = CreateEngineMap();
 	IEngineMasterServer *pEngineMasterServer = CreateEngineMasterServer();
 
+	if (IsRandFail)
+	{
+		dbg_msg("secure", "could not initialize secure RNG");
+		return -1;
+	}
+
 	{
 		bool RegisterFail = false;