diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index ef457b92f..05ae12905 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -643,7 +643,7 @@ void Client::Tick()
 			if(data)
 				free(data);
 		}
-		else
+		else if(data)
 		{
 			std::istringstream dataStream(data);