diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java
index 5fc078b2c..55ed932d9 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftCreativeCategory.java
@@ -20,10 +20,15 @@ public final class CraftCreativeCategory {
             .build();
 
     public static CreativeCategory fromNMS(CreativeModeTab tab) {
-        if (!NMS_TO_BUKKIT.containsKey(tab)) {
+        if (tab == null) {
+            return null;
+        }
+
+        CreativeCategory bukkit = NMS_TO_BUKKIT.get(tab);
+        if (bukkit == null) {
             throw new UnsupportedOperationException("Item is not present in any known CreativeModeTab. This is a bug.");
         }
 
-        return (tab != null) ? NMS_TO_BUKKIT.get(tab) : null;
+        return bukkit;
     }
 }