diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8830598d0..f0cdfdbeb 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Fixed OPs not having global permissions on secured storage systems (raoulvdberge)
 - Fixed crash when Destructor tries to break secured network block (raoulvdberge)
 - Fixed Fluid Interface not dropping inventory contents (raoulvdberge)
+- Fixed Disk Manipulator crash (raoulvdberge)
 - Updated Forge to 2232 (raoulvdberge)
 
 ### 1.4
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java
index d2ee9dab3..7d60b06f1 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java
@@ -42,7 +42,15 @@ public class BlockDiskManipulator extends BlockNode {
 
     @Override
     public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return ((IExtendedBlockState) super.getExtendedState(state, world, pos)).withProperty(DISK_STATE, ((TileDiskManipulator) world.getTileEntity(pos)).getDiskState());
+        IBlockState s = super.getExtendedState(state, world, pos);
+
+        TileEntity tile = world.getTileEntity(pos);
+
+        if (tile instanceof TileDiskManipulator) {
+            s = ((IExtendedBlockState) s).withProperty(DISK_STATE, ((TileDiskManipulator) tile).getDiskState());
+        }
+
+        return s;
     }
 
     @Override