diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java
index 06c783f92..f3ae91f03 100755
--- a/src/main/java/refinedstorage/RefinedStorage.java
+++ b/src/main/java/refinedstorage/RefinedStorage.java
@@ -19,7 +19,7 @@ import refinedstorage.proxy.CommonProxy;
 @Mod(modid = RefinedStorage.ID, version = RefinedStorage.VERSION)
 public final class RefinedStorage {
     public static final String ID = "refinedstorage";
-    public static final String VERSION = "0.6.7";
+    public static final String VERSION = "0.6.8";
 
     public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(ID);
 
diff --git a/src/main/java/refinedstorage/tile/TileMachine.java b/src/main/java/refinedstorage/tile/TileMachine.java
index cc7d1f221..305fb89a1 100755
--- a/src/main/java/refinedstorage/tile/TileMachine.java
+++ b/src/main/java/refinedstorage/tile/TileMachine.java
@@ -173,7 +173,7 @@ public abstract class TileMachine extends TileBase implements ISynchronizedConta
 
         nbt.setInteger(RedstoneMode.NBT, redstoneMode.id);
 
-        if (connected) {
+        if (controller != null && connected) {
             nbt.setInteger(NBT_CONTROLLER_X, controller.getPos().getX());
             nbt.setInteger(NBT_CONTROLLER_Y, controller.getPos().getY());
             nbt.setInteger(NBT_CONTROLLER_Z, controller.getPos().getZ());