diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java
index 2f4fad250..97d18f5d5 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/externalstorage/FluidExternalStorageCache.java
@@ -32,7 +32,7 @@ public class FluidExternalStorageCache {
             FluidStack actual = handler.getFluidInTank(i);
 
             if (i >= cache.size()) { // ENLARGED
-                if (actual != null) {
+                if (!actual.isEmpty()) {
                     network.getFluidStorageCache().add(actual, actual.getAmount(), false, true);
 
                     cache.add(actual.copy());
@@ -43,15 +43,15 @@ public class FluidExternalStorageCache {
 
             FluidStack cached = cache.get(i);
 
-            if (actual == null && cached == null) { // NONE
+            if (actual.isEmpty() && cached.isEmpty()) { // NONE
                 continue;
             }
 
-            if (actual == null && cached != null) { // REMOVED
+            if (actual.isEmpty() && !cached.isEmpty()) { // REMOVED
                 network.getFluidStorageCache().remove(cached, cached.getAmount(), true);
 
                 cache.set(i, null);
-            } else if (actual != null && cached == null) { // ADDED
+            } else if (!actual.isEmpty() && cached.isEmpty()) { // ADDED
                 network.getFluidStorageCache().add(actual, actual.getAmount(), false, true);
 
                 cache.set(i, actual.copy());
@@ -75,7 +75,7 @@ public class FluidExternalStorageCache {
             for (int i = cache.size() - 1; i >= handler.getTanks(); --i) { // Reverse order for the remove call.
                 FluidStack cached = cache.get(i);
 
-                if (cached != null) {
+                if (!cached.isEmpty()) {
                     network.getFluidStorageCache().remove(cached, cached.getAmount(), true);
                 }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java
index 64d43e446..85a05a96a 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/util/WorldUtils.java
@@ -59,6 +59,7 @@ public final class WorldUtils {
         if (tile != null) {
             return tile.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, side).orElse(null);
         }
+
         return null;
     }