diff --git a/OpenRA.Server/Server.cs b/OpenRA.Server/Server.cs
index 530a577865..126216cd4e 100644
--- a/OpenRA.Server/Server.cs
+++ b/OpenRA.Server/Server.cs
@@ -215,7 +215,7 @@ namespace OpenRA.Server
 			try
 			{
 				c.socket.Blocking = true;
-				c.socket.Send(BitConverter.GetBytes(data.Length + 8));
+				c.socket.Send(BitConverter.GetBytes(data.Length + 4));
 				c.socket.Send(BitConverter.GetBytes(client));
 				c.socket.Send(BitConverter.GetBytes(frame));
 				c.socket.Send(data);
diff --git a/OpenRa.Game/Network/Connection.cs b/OpenRa.Game/Network/Connection.cs
index 97e57497d0..5becdcee8a 100755
--- a/OpenRa.Game/Network/Connection.cs
+++ b/OpenRa.Game/Network/Connection.cs
@@ -92,7 +92,7 @@ namespace OpenRa.Network
 							receivedPackets.Add( new ReceivedPacket { FromClient = client, Data = buf } );
 					}
 				}
-				catch
+				catch( SocketException )
 				{
 					connectionState = ConnectionState.NotConnected;
 				}