diff --git a/src/main/java/refinedstorage/tile/TileSlave.java b/src/main/java/refinedstorage/tile/TileSlave.java
index f1fcc0f8a..a5f7c8a93 100755
--- a/src/main/java/refinedstorage/tile/TileSlave.java
+++ b/src/main/java/refinedstorage/tile/TileSlave.java
@@ -88,7 +88,12 @@ public abstract class TileSlave extends TileBase implements ISynchronizedContain
 
         if (network == null) {
             if (controller != null) {
-                connect(world, NetworkMasterRegistry.get(controller.getPos(), world.provider.getDimension()));
+                // For backwards compatiblity
+                NetworkMaster network = NetworkMasterRegistry.get(controller.getPos(), world.provider.getDimension());
+
+                if (network != null) {
+                    connect(world, network);
+                }
             }
         } else {
             if (controller == null) {
diff --git a/src/main/java/refinedstorage/tile/controller/StorageHandler.java b/src/main/java/refinedstorage/tile/controller/StorageHandler.java
index c39398e6e..ebe2c9ad6 100755
--- a/src/main/java/refinedstorage/tile/controller/StorageHandler.java
+++ b/src/main/java/refinedstorage/tile/controller/StorageHandler.java
@@ -94,12 +94,16 @@ public class StorageHandler {
 
         int quantityPerRequest = 0;
 
+        System.out.println("stack:"+stack);
         CraftingPattern pattern = network.getPatternWithBestScore(stack);
+        System.out.println("pattern: " +pattern);
 
         if (pattern != null) {
             for (ItemStack output : pattern.getOutputs()) {
+                System.out.println("output:"+output);
                 if (RefinedStorageUtils.compareStackNoQuantity(stack, output)) {
                     quantityPerRequest += output.stackSize;
+                    System.out.println("QPR:"+quantityPerRequest);
 
                     if (!pattern.isProcessing()) {
                         break;