diff --git a/src/main/java/cr0s/warpdrive/block/BlockAbstractContainer.java b/src/main/java/cr0s/warpdrive/block/BlockAbstractContainer.java
index 796652a5..30889540 100644
--- a/src/main/java/cr0s/warpdrive/block/BlockAbstractContainer.java
+++ b/src/main/java/cr0s/warpdrive/block/BlockAbstractContainer.java
@@ -201,6 +201,10 @@ public abstract class BlockAbstractContainer extends BlockContainer implements I
 			return;
 		}
 		final TileEntity tileEntity = blockAccess.getTileEntity(blockPos);
+		if ( tileEntity == null
+		  || tileEntity.getWorld().isRemote ) {
+			return;
+		}
 		if (tileEntity instanceof IBlockUpdateDetector) {
 			((IBlockUpdateDetector) tileEntity).onBlockUpdateDetected();
 		}