diff --git a/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs b/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs
index 2dc31ab59..b6ae6ebf9 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/CharacterNetworking.cs
@@ -174,7 +174,16 @@ namespace Barotrauma
                     switch (eventType)
                     {
                         case 0:
-                            inventory.ClientRead(type, msg, sendingTime);
+                            if (inventory == null)
+                            {
+                                string errorMsg = "Received an inventory update message for an entity with no inventory (" + Name + ")";
+                                DebugConsole.ThrowError(errorMsg);
+                                GameAnalyticsManager.AddErrorEventOnce("CharacterNetworking.ClientRead:NoInventory" + ID, GameAnalyticsSDK.Net.EGAErrorSeverity.Error, errorMsg);
+                            }
+                            else
+                            {
+                                inventory?.ClientRead(type, msg, sendingTime);
+                            }
                             break;
                         case 1:
                             byte ownerID = msg.ReadByte();