diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
index 9a1afe16d..f94ca4c9a 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java
@@ -218,7 +218,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
             while (itemFilters.getSlots() > i && extracted == null) {
                 ItemStack filterStack = ItemStack.EMPTY;
 
-                while (itemFilters.getSlots() > i && filterStack == null) {
+                while (itemFilters.getSlots() > i && filterStack.isEmpty()) {
                     filterStack = itemFilters.getStackInSlot(i++);
                 }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerFluid.java
index 5a9a9ac01..62217b8d4 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerFluid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/inventory/ItemHandlerFluid.java
@@ -30,6 +30,7 @@ public class ItemHandlerFluid extends ItemHandlerBase {
         }
     }
 
+    @Nullable
     public FluidStack getFluidStackInSlot(int slot) {
         return fluids[slot];
     }