diff --git a/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java b/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java
index 862110688..035984b6c 100644
--- a/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java
+++ b/src/main/java/world/bentobox/bentobox/hooks/ItemsAdderHook.java
@@ -119,12 +119,13 @@ public static String getInCustomRegion(Location loc) {
      */
     public static Optional<ItemStack> getItemStack(String namespacedId) {
         CustomBlock cb = getInstance(namespacedId);
-        ItemStack item = cb.getItemStack();
-        if (item != null) {
-            ItemMeta meta = item.getItemMeta();
-            meta.displayName(Component.text(cb.getDisplayName()));
-            item.setItemMeta(meta);
+        if (cb == null) {
+            return Optional.empty();
         }
+        ItemStack item = cb.getItemStack();
+        ItemMeta meta = item.getItemMeta();
+        meta.displayName(Component.text(cb.getDisplayName()));
+        item.setItemMeta(meta);
         return Optional.of(item);
     }