From b51693207d42ac131d47bc63add62a374668b5ee Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Mon, 16 Jul 2018 12:00:22 +0200
Subject: [PATCH] Fixes #1853 - pt. 2

---
 .../apiimpl/autocrafting/CraftingManager.java               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java
index 4f3d3d54d..a816c3ee3 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java
@@ -127,8 +127,10 @@ public class CraftingManager implements ICraftingManager {
             boolean changed = !tasksToCancel.isEmpty() || !tasksToAdd.isEmpty();
 
             for (UUID idToCancel : tasksToCancel) {
-                this.tasks.get(idToCancel).onCancelled();
-                this.tasks.remove(idToCancel);
+                if (this.tasks.containsKey(idToCancel)) {
+                    this.tasks.get(idToCancel).onCancelled();
+                    this.tasks.remove(idToCancel);
+                }
             }
             this.tasksToCancel.clear();