diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java
index e423d401d..6c1b337a3 100755
--- a/src/main/java/refinedstorage/tile/TileSolderer.java
+++ b/src/main/java/refinedstorage/tile/TileSolderer.java
@@ -200,7 +200,7 @@ public class TileSolderer extends TileMachine {
 
     @Override
     public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
-        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) {
+        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && facing != null) {
             int i = facing.ordinal();
 
             if (itemsFacade[i] == null) {
diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java
index ccb40025f..fca63a4f0 100755
--- a/src/main/java/refinedstorage/tile/controller/TileController.java
+++ b/src/main/java/refinedstorage/tile/controller/TileController.java
@@ -300,8 +300,8 @@ public class TileController extends TileBase implements IEnergyReceiver, IEnergy
                 this.wirelessGridRange += ((TileWirelessTransmitter) machine).getRange();
             }
 
-            if (machine.hasCapability(RefinedStorageCapabilities.STORAGE_PROVIDER_CAPABILITY, EnumFacing.DOWN)) {
-                machine.getCapability(RefinedStorageCapabilities.STORAGE_PROVIDER_CAPABILITY, EnumFacing.DOWN).provide(storages);
+            if (machine.hasCapability(RefinedStorageCapabilities.STORAGE_PROVIDER_CAPABILITY, null)) {
+                machine.getCapability(RefinedStorageCapabilities.STORAGE_PROVIDER_CAPABILITY, null).provide(storages);
             }
 
             if (machine instanceof TileCrafter) {