diff --git a/core/src/mindustry/world/modules/ItemModule.java b/core/src/mindustry/world/modules/ItemModule.java
index 63caf86b1f..04c9a878c2 100644
--- a/core/src/mindustry/world/modules/ItemModule.java
+++ b/core/src/mindustry/world/modules/ItemModule.java
@@ -336,8 +336,11 @@ public class ItemModule extends BlockModule{
         for(int j = 0; j < count; j++){
             int itemid = legacy ? read.ub() : read.s();
             int itemamount = read.i();
-            items[content.item(itemid).id] = itemamount;
-            total += itemamount;
+            Item item = content.item(itemid);
+            if(item != null){
+                items[item.id] = itemamount;
+                total += itemamount;
+            }
         }
     }
 
diff --git a/core/src/mindustry/world/modules/LiquidModule.java b/core/src/mindustry/world/modules/LiquidModule.java
index 43987bbcc5..497cc5f70e 100644
--- a/core/src/mindustry/world/modules/LiquidModule.java
+++ b/core/src/mindustry/world/modules/LiquidModule.java
@@ -162,11 +162,13 @@ public class LiquidModule extends BlockModule{
 
         for(int j = 0; j < count; j++){
             Liquid liq = content.liquid(legacy ? read.ub() : read.s());
-            int liquidid = liq.id;
             float amount = read.f();
-            liquids[liquidid] = amount;
-            if(amount > 0){
-                current = liq;
+            if(liq != null){
+                int liquidid = liq.id;
+                liquids[liquidid] = amount;
+                if(amount > 0){
+                    current = liq;
+                }
             }
         }
     }