diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala b/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
index fd4fbe9c6..059e06e22 100644
--- a/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
+++ b/src/main/scala/li/cil/oc/server/component/UpgradeCrafting.scala
@@ -58,6 +58,9 @@ class UpgradeCrafting(val host: EnvironmentHost with internal.Robot) extends Abs
       val cm = CraftingManager.getInstance
       var countCrafted = 0
       val originalCraft = cm.findMatchingRecipe(CraftingInventory, host.world)
+      if (originalCraft == null) {
+        return Seq(false, 0)
+      }
       breakable {
         while (countCrafted < wantedCount) {
           val result = cm.findMatchingRecipe(CraftingInventory, host.world)