diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java
index 4a0b5f844f..10b125300c 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryMerchant.java
@@ -17,7 +17,8 @@ public class CraftInventoryMerchant extends CraftInventory implements MerchantIn
 
     @Override
     public MerchantRecipe getSelectedRecipe() {
-        return getInventory().getRecipe().asBukkit();
+        net.minecraft.server.MerchantRecipe nmsRecipe = getInventory().getRecipe();
+        return (nmsRecipe == null) ? null : nmsRecipe.asBukkit();
     }
 
     @Override