diff --git a/src/game.cpp b/src/game.cpp
index af744dcbb..f5a19a7e4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -2116,6 +2116,9 @@ bool Game::connectToServer(const std::string &playername,
 		const std::string &password, std::string *address, u16 port,
 		bool *connect_ok, bool *aborted)
 {
+	*connect_ok = false;	// Let's not be overly optimistic
+	*aborted = false;
+
 	showOverlayMessage("Resolving address...", 0, 15);
 
 	Address connect_address(0, 0, 0, 0, port);
@@ -2158,14 +2161,12 @@ bool Game::connectToServer(const std::string &playername,
 
 	gamedef = client;	// Client acts as our GameDef
 
-
 	infostream << "Connecting to server at ";
 	connect_address.print(&infostream);
 	infostream << std::endl;
 
 	client->connect(connect_address);
 
-
 	/*
 		Wait for server to accept connection
 	*/