Index: binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs	(revision 109)
+++ binary-improvements/7dtd-server-fixes/src/CommonMappingFunctions.cs	(revision 110)
@@ -44,8 +44,9 @@
 	public static int GetClientID (ClientInfo _ci)
 	{
-		if (_ci != null)
-			return _ci.clientId;
-		else
-			return -1;
+		if (_ci != null) {
+			if (GetConnectionManager ().connectedClients.ContainsKey (_ci.clientId))
+				return _ci.clientId;
+		}
+		return -1;
 	}