diff --git a/src/main/java/mekanism/common/recipe/MekanismRecipe.java b/src/main/java/mekanism/common/recipe/MekanismRecipe.java index 3abaf1605..bd0b0bc91 100644 --- a/src/main/java/mekanism/common/recipe/MekanismRecipe.java +++ b/src/main/java/mekanism/common/recipe/MekanismRecipe.java @@ -204,7 +204,7 @@ public class MekanismRecipe implements IRecipe } } - if(MachineType.get(toReturn).supportsUpgrades) + if(MachineType.get(toReturn) != null && MachineType.get(toReturn).supportsUpgrades) { Map upgrades = new HashMap(); @@ -212,7 +212,7 @@ public class MekanismRecipe implements IRecipe { ItemStack itemstack = inv.getStackInSlot(i); - if(itemstack != null && MachineType.get(itemstack).supportsUpgrades) + if(itemstack != null && MachineType.get(itemstack) != null && MachineType.get(itemstack).supportsUpgrades) { Map stackMap = Upgrade.buildMap(itemstack.stackTagCompound);