diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageFluidExternal.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageFluidExternal.java
index d54f5018f..fba64751d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageFluidExternal.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageFluidExternal.java
@@ -29,7 +29,7 @@ public class StorageFluidExternal implements IStorage<FluidStack> {
     private IFluidTankProperties getProperties() {
         IFluidHandler handler = handlerSupplier.get();
 
-        return (handler != null && handler.getTankProperties().length != 0) ? handler.getTankProperties()[0] : null;
+        return (handler != null && handler.getTankProperties() != null && handler.getTankProperties().length != 0) ? handler.getTankProperties()[0] : null;
     }
 
     private FluidStack getContents() {