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();