Index: binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs
===================================================================
--- binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs	(revision 159)
+++ binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs	(revision 161)
@@ -33,9 +33,9 @@
 
 		public string Name {
-			get { return name; }
+			get { return name == null ? string.Empty : name; }
 		}
 
 		public string IP {
-			get { return ip; }
+			get { return ip == null ? string.Empty : ip; }
 		}
 
@@ -96,12 +96,14 @@
 		public void SetOffline ()
 		{
-			Log.Out ("Player set to offline: " + steamId);
-			Vector3i lastPos = new Vector3i (Entity.GetPosition ());
-			lastPositionX = lastPos.x;
-			lastPositionY = lastPos.y;
-			lastPositionZ = lastPos.z;
-			totalPlayTime += (long)(Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad);
-			lastOnline = DateTime.Now;
-			clientInfo = null;
+			if (clientInfo != null) {
+				Log.Out ("Player set to offline: " + steamId);
+				Vector3i lastPos = new Vector3i (Entity.GetPosition ());
+				lastPositionX = lastPos.x;
+				lastPositionY = lastPos.y;
+				lastPositionZ = lastPos.z;
+				totalPlayTime += (long)(Time.timeSinceLevelLoad - Entity.CreationTimeSinceLevelLoad);
+				lastOnline = DateTime.Now;
+				clientInfo = null;
+			}
 		}