diff --git a/CHANGELOG.md b/CHANGELOG.md
index be9843a85..56dec854b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 1.5.16
 - Fixed crash when placing a Controller (raoulvdberge)
+- Fixed crash when configuring an Exporter (raoulvdberge)
 
 ### 1.5.15
 - Updated Forge to 2444 (MC 1.12.1) (raoulvdberge)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java
index 5d2e61f99..4ab720842 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java
@@ -150,13 +150,15 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
                 if (took != null && ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) {
                     took = network.extractItem(slot, 1, compare, false);
 
-                    ItemHandlerHelper.insertItem(handler, took, false);
+                    if (took != null) {
+                        ItemHandlerHelper.insertItem(handler, took, false);
 
-                    craftOnlyToExtract[i]--;
+                        craftOnlyToExtract[i]--;
 
-                    if (craftOnlyToExtract[i] <= 0) {
-                        craftOnlyToExtract[i] = null;
-                        craftOnlyTask[i] = null;
+                        if (craftOnlyToExtract[i] <= 0) {
+                            craftOnlyToExtract[i] = null;
+                            craftOnlyTask[i] = null;
+                        }
                     }
                 }
             } else if (!network.getCraftingManager().getTasks().contains(craftOnlyTask[i])) {
@@ -188,7 +190,9 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
             } else if (ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) {
                 took = network.extractItem(slot, upgrades.getItemInteractCount(), compare, false);
 
-                ItemHandlerHelper.insertItem(handler, took, false);
+                if (took != null) {
+                    ItemHandlerHelper.insertItem(handler, took, false);
+                }
             }
         }
     }