Index: binary-improvements2/7dtd-server-fixes/src/ModApi.cs
===================================================================
--- binary-improvements2/7dtd-server-fixes/src/ModApi.cs	(revision 402)
+++ binary-improvements2/7dtd-server-fixes/src/ModApi.cs	(revision 403)
@@ -21,8 +21,16 @@
 
 		private void SavePlayerData (ClientInfo _cInfo, PlayerDataFile _playerDataFile) {
+			if (_cInfo == null) {
+				return;
+			}
+
 			PersistentContainer.Instance.Players [_cInfo.InternalId, true].Update (_playerDataFile);
 		}
 
 		private void PlayerSpawning (ClientInfo _cInfo, int _chunkViewDim, PlayerProfile _playerProfile) {
+			if (_cInfo == null) {
+				return;
+			}
+
 			string owner = null;
 			if (_cInfo.PlatformId is UserIdentifierSteam identifierSteam) {
@@ -36,4 +44,8 @@
 
 		private void PlayerDisconnected (ClientInfo _cInfo, bool _bShutdown) {
+			if (_cInfo == null) {
+				return;
+			}
+
 			Player p = PersistentContainer.Instance.Players [_cInfo.InternalId, false];
 			if (p != null) {
@@ -47,4 +59,8 @@
 
 		private void PlayerSpawned (ClientInfo _cInfo, RespawnType _respawnReason, Vector3i _spawnPos) {
+			if (_cInfo == null) {
+				return;
+			}
+
 			PersistentContainer.Instance.Players [_cInfo.InternalId, true].SetOnline (_cInfo);
 			PersistentContainer.Instance.Save ();
@@ -56,14 +72,14 @@
 		private bool ChatMessage (ClientInfo _cInfo, EChatType _type, int _senderId, string _msg, string _mainName,
 			bool _localizeMain, List<int> _recipientEntityIds) {
+			if (_cInfo == null) {
+				return true;
+			}
+
 			if (string.IsNullOrEmpty (_msg) || !_msg.EqualsCaseInsensitive ("/alloc")) {
 				return true;
 			}
 
-			if (_cInfo != null) {
-				Log.Out ($"Sent chat hook reply to {_cInfo.InternalId}");
-				_cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, testChatAnswer, "", false, null));
-			} else {
-				Log.Error ($"ChatHookExample: Argument _cInfo null on message: {_msg}");
-			}
+			Log.Out ($"Sent chat hook reply to {_cInfo.InternalId}");
+			_cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, testChatAnswer, "", false, null));
 
 			return false;