diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java
index 5b39f025..a6ea5d37 100644
--- a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java
+++ b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java
@@ -259,7 +259,9 @@ public class PartFluidStorageBus extends PartUpgradeable
 
     @Override
     public void onNeighborChanged() {
-        BlockPos neighbor = new BlockPos(this.getTile()).getOffSet(this.getSide());
+        TileEntity tile = this.getTile();
+        if (tile == null || this.getProxy() == null || !this.getProxy().isActive()) return;
+        BlockPos neighbor = new BlockPos(tile).getOffSet(this.getSide());
         final TileEntity te = neighbor.getTileEntity();
         // In case the TE was destroyed, we have to do a full reset immediately.
         if (te instanceof TileCableBus) {
@@ -288,6 +290,7 @@ public class PartFluidStorageBus extends PartUpgradeable
         } else {
             this.resetCache(false);
         }
+
     }
 
     @Override