diff --git a/CHANGELOG.md b/CHANGELOG.md
index af071ad35..699217695 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.6.8
+- Fixed Ender IO incompatibility (raoulvdberge)
+
 ### 1.6.7
 - Fixed the Raw Processor recipes not taking oredicted silicon (raoulvdberge)
 - Fixed the Processor Binding recipe not taking oredicted slimeballs (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingManager.java b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingManager.java
index eb34b271c..92d83ad2e 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingManager.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/api/autocrafting/ICraftingManager.java
@@ -77,6 +77,24 @@ public interface ICraftingManager {
      */
     ICraftingPatternChainList createPatternChainList();
 
+    /**
+     * @deprecated Use {@link #request(INetworkNode, ItemStack, int)}
+     */
+    @Nullable
+    @Deprecated
+    default ICraftingTask request(ItemStack stack, int amount) {
+        return request(null, stack, amount);
+    }
+
+    /**
+     * @deprecated Use {@link #request(INetworkNode, FluidStack, int)}
+     */
+    @Nullable
+    @Deprecated
+    default ICraftingTask request(FluidStack stack, int amount) {
+        return request(null, stack, amount);
+    }
+
     /**
      * Schedules a crafting task if the task isn't scheduled yet.
      *
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 1c3fd559a..aa6c0a32b 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java
@@ -12,6 +12,7 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTaskError;
 import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
 import com.raoulvdberge.refinedstorage.api.util.IComparer;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
+import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper;
 import com.raoulvdberge.refinedstorage.tile.TileController;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -297,11 +298,21 @@ public class CraftingManager implements ICraftingManager {
         return null;
     }
 
-    private void throttle(INetworkNode node) {
-        throttledRequesters.put(node, MinecraftServer.getCurrentTimeMillis());
+    private void throttle(@Nullable INetworkNode node) {
+        OneSixMigrationHelper.removalHook(); // Remove @Nullable node
+
+        if (node != null) {
+            throttledRequesters.put(node, MinecraftServer.getCurrentTimeMillis());
+        }
     }
 
-    private boolean isThrottled(INetworkNode node) {
+    private boolean isThrottled(@Nullable INetworkNode node) {
+        OneSixMigrationHelper.removalHook(); // Remove @Nullable node
+
+        if (node == null) {
+            return false;
+        }
+
         Long throttledSince = throttledRequesters.get(node);
         if (throttledSince == null) {
             return false;