diff --git a/src/main/java/com/glodblock/github/inventory/external/AEFluidInterfaceHandler.java b/src/main/java/com/glodblock/github/inventory/external/AEFluidInterfaceHandler.java
index 38d7df34..7b55c18f 100644
--- a/src/main/java/com/glodblock/github/inventory/external/AEFluidInterfaceHandler.java
+++ b/src/main/java/com/glodblock/github/inventory/external/AEFluidInterfaceHandler.java
@@ -5,8 +5,11 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import appeng.api.implementations.tiles.ITileStorageMonitorable;
 import appeng.api.networking.security.BaseActionSource;
+import appeng.api.parts.IPart;
+import appeng.api.parts.IPartHost;
 import appeng.api.storage.IExternalStorageHandler;
 import appeng.api.storage.IMEInventory;
+import appeng.api.storage.IStorageMonitorable;
 import appeng.api.storage.StorageChannel;
 import appeng.util.Platform;
 
@@ -16,8 +19,8 @@ public class AEFluidInterfaceHandler implements IExternalStorageHandler {
     public boolean canHandle(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource mySrc) {
         if (channel == StorageChannel.FLUIDS) {
             if (te instanceof ITileStorageMonitorable) {
-                return true;
-            } else return Platform.getPartFromTE(te, d.getOpposite()) instanceof ITileStorageMonitorable;
+                return !(te instanceof IPartHost);
+            } else return getMonitorablePart(te, d, mySrc) != null;
         }
         return false;
     }
@@ -26,14 +29,19 @@ public class AEFluidInterfaceHandler implements IExternalStorageHandler {
     @SuppressWarnings("rawtypes")
     public IMEInventory getInventory(TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src) {
         if (channel == StorageChannel.FLUIDS) {
-            if (te instanceof ITileStorageMonitorable
-                    && ((ITileStorageMonitorable) te).getMonitorable(d, src) != null) {
-                return ((ITileStorageMonitorable) te).getMonitorable(d, src).getFluidInventory();
-            } else if (Platform.getPartFromTE(te, d.getOpposite()) instanceof ITileStorageMonitorable part
-                    && part.getMonitorable(d, src) != null) {
-                        return part.getMonitorable(d, src).getFluidInventory();
-                    }
+            if (te instanceof ITileStorageMonitorable tsm) {
+                final IStorageMonitorable monitorable = tsm.getMonitorable(d, src);
+                return monitorable != null ? monitorable.getFluidInventory() : null;
+            } else {
+                final IStorageMonitorable monitorable = getMonitorablePart(te, d, src);
+                return monitorable != null ? monitorable.getFluidInventory() : null;
+            }
         }
         return null;
     }
+
+    private static IStorageMonitorable getMonitorablePart(TileEntity te, ForgeDirection d, BaseActionSource src) {
+        final IPart part = Platform.getPartFromTE(te, d);
+        return part instanceof ITileStorageMonitorable monitorablePart ? monitorablePart.getMonitorable(d, src) : null;
+    }
 }