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 392e70273..508fb1920 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
@@ -97,12 +97,13 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
                             boolean skipSlot = false;
 
                             if (regulator) {
-                                for (int index = 0; i < handler.getSlots() && !skipSlot; i++) {
+                                for (int index = 0; index < handler.getSlots(); index++) {
                                     ItemStack exporterStack = handler.getStackInSlot(index);
 
                                     if (API.instance().getComparer().isEqual(slot, exporterStack, compare)) {
                                         if (exporterStack.getCount() >= slot.getCount()) {
                                             skipSlot = true;
+                                            break;
                                         } else {
                                             stackSize = upgrades.hasUpgrade(ItemUpgrade.TYPE_STACK) ? slot.getCount() - exporterStack.getCount() : 1;
                                         }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java
index 824dc8f5d..9a0746355 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java
@@ -51,6 +51,10 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi
 
     @Override
     public void update() {
+        if (network == null) {
+            return;
+        }
+        
         if (type == IType.ITEMS) {
             TileEntity tile = holder.world().getTileEntity(holder.pos().offset(holder.getDirection()));
             IItemHandler handler = RSUtils.getItemHandler(tile, holder.getDirection().getOpposite());