diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/ItemStorage.java b/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/ItemStorage.java
index dd9a14bf..4c0ca7cc 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/ItemStorage.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/detonator/storage/ItemStorage.java
@@ -29,6 +29,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.persistence.PersistentDataContainer;
 import org.bukkit.persistence.PersistentDataType;
 
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.function.IntFunction;
@@ -121,6 +122,9 @@ public class ItemStorage implements DetonatorStorage {
     private List<Location> read() {
         List<Location> tempLocs = new LinkedList<>();
 
+        if (itemStack == null) {
+            return Collections.emptyList();
+        }
         ItemMeta meta = itemStack.getItemMeta();
         PersistentDataContainer container = meta.getPersistentDataContainer();