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 4c0ca7cc..71b6edb4 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
@@ -126,6 +126,9 @@ public class ItemStorage implements DetonatorStorage {
             return Collections.emptyList();
         }
         ItemMeta meta = itemStack.getItemMeta();
+        if (meta == null) {
+            return Collections.emptyList();
+        }
         PersistentDataContainer container = meta.getPersistentDataContainer();
 
         int length = length();