From 6bae353118e4940e554a198ef944f4e826e1df1e Mon Sep 17 00:00:00 2001
From: "Aidan C. Brady" <aidancbrady@aol.com>
Date: Thu, 19 Mar 2015 20:41:18 -0400
Subject: [PATCH] Fixed a transition crash

---
 src/main/java/mekanism/common/recipe/MekanismRecipe.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<Upgrade, Integer> upgrades = new HashMap<Upgrade, Integer>();
 
@@ -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<Upgrade, Integer> stackMap = Upgrade.buildMap(itemstack.stackTagCompound);