Index: binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs	(revision 228)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/PersistentContainer.cs	(revision 230)
@@ -54,5 +54,6 @@
 					return true;
 				} catch (Exception e) {
-					Log.Out ("Exception in PersistentContainer.Load: " + e.Message);
+					Log.Error ("Exception in PersistentContainer.Load");
+					Log.Exception (e);
 				}
 			}
Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs	(revision 228)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs	(revision 230)
@@ -59,5 +59,5 @@
 			get {
 				if (IsOnline) {
-					return CommonMappingFunctions.GetEntityPlayer (clientInfo);
+					return GameManager.Instance.World.Players.dict [clientInfo.entityId];
 				} else {
 					return null;
@@ -116,6 +116,6 @@
 			Log.Out ("Player set to online: " + steamId);
 			clientInfo = ci;
-			entityId = CommonMappingFunctions.GetEntityID (ci);
-			name = CommonMappingFunctions.GetPlayerName (ci);
+			entityId = ci.entityId;
+			name = ci.playerName;
 			ip = ci.ip;
 		}