diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index ef457b92f..22490a1a7 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -144,7 +144,7 @@ void Client::Initialise(std::string proxyString)
 	stampsLib.close();
 
 	//Begin version check
-	versionCheckRequest = http_async_req_start(NULL, SERVER "/Startup.json", NULL, 0, 0);
+	versionCheckRequest = http_async_req_start(NULL, "http://" SERVER "/Startup.json", NULL, 0, 0);
 
 	if(authUser.ID)
 	{
@@ -643,7 +643,7 @@ void Client::Tick()
 			if(data)
 				free(data);
 		}
-		else
+		else if(data)
 		{
 			std::istringstream dataStream(data);