Index: binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs	(revision 155)
+++ binary-improvements/7dtd-server-fixes/src/AllocsLogFunctions.cs	(revision 156)
@@ -38,9 +38,8 @@
 		public static void PlayerDisconnected (GameManager manager, int _clientId) {
 			try {
-				ClientInfo ci = CommonMappingFunctions.GetClientInfoFromClientID (_clientId);
-				string steamId = CommonMappingFunctions.GetSteamID (ci);
-				Players players = PersistentContainer.Instance.Players;
-				if (players.SteamIDs.Contains(steamId))
-					players[steamId].SetOffline();
+				Player p = PersistentContainer.Instance.Players.GetPlayerByClientId(_clientId);
+				if (p != null) {
+					p.SetOffline();
+				}
 				PersistentData.PersistentContainer.Instance.Save ();
 			} catch (Exception e) {
Index: binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs	(revision 155)
+++ binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs	(revision 156)
@@ -59,5 +59,5 @@
 									}
 									Instance.dirtyChunks [cPos2] = realColors;
-									Log.Out ("Add Dirty: " + cPos2);
+									//Log.Out ("Add Dirty: " + cPos2);
 									Instance.chunkSaveTimer.Stop ();
 									Instance.chunkSaveTimer.Start ();
Index: binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs	(revision 155)
+++ binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/ApiHandler.cs	(revision 156)
@@ -26,9 +26,13 @@
 				resp.StatusCode = (int)HttpStatusCode.Forbidden;
 			} else {
-				foreach (KeyValuePair<string, WebAPI> kvp in apis) {
-					if (apiName.StartsWith (kvp.Key)) {
-						kvp.Value.HandleRequest (req, resp, user);
-						return;
+				try {
+					foreach (KeyValuePair<string, WebAPI> kvp in apis) {
+						if (apiName.StartsWith (kvp.Key)) {
+							kvp.Value.HandleRequest (req, resp, user);
+							return;
+						}
 					}
+				} catch (Exception e) {
+					resp.StatusCode = (int)HttpStatusCode.InternalServerError;
 				}
 			}
Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs	(revision 155)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs	(revision 156)
@@ -35,4 +35,14 @@
 		}
 
+		public Player GetPlayerByClientId (int _clientid)
+		{
+			foreach (Player p in players.Values) {
+				if (p.ClientInfo.clientId == _clientid) {
+					return p;
+				}
+			}
+			return null;
+		}
+
 		public string GetSteamID (string _nameOrId, bool _ignoreColorCodes)
 		{
Index: binary-improvements/bin/Release/7dtd-server-fixes_version.txt
===================================================================
--- binary-improvements/bin/Release/7dtd-server-fixes_version.txt	(revision 155)
+++ binary-improvements/bin/Release/7dtd-server-fixes_version.txt	(revision 156)
@@ -1,1 +1,1 @@
-Version:       0.91.5358.38435
+Version:       0.91.5359.21630