diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7bf99bd3..080d30f1b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.2.6
+- Fixed crash with exporters in fluid mode (raoulvdberge)
+
 ### 1.2.5
 - The Constructor can now place fireworks (raoulvdberge)
 - Added "View Recipes" JEI toggle in Solderer (way2muchnoise)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java
index 926a10527..aae98e9f5 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/FluidGridHandler.java
@@ -24,7 +24,7 @@ public class FluidGridHandler implements IFluidGridHandler {
     public void onExtract(int hash, boolean shift, EntityPlayerMP player) {
         FluidStack stack = network.getFluidStorageCache().getList().get(hash);
 
-        if (stack == null || stack.amount < 1000) {
+        if (stack == null || stack.amount < Fluid.BUCKET_VOLUME) {
             return;
         }
 
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
index ed2465705..ea2f1c184 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java
@@ -128,7 +128,7 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I
             } else if (type == IType.FLUIDS) {
                 FluidStack stack = fluidFilters.getFluidStackInSlot(0);
 
-                if (stack != null && stack.getFluid().canBePlacedInWorld() && stack.amount >= 1000) {
+                if (stack != null && stack.getFluid().canBePlacedInWorld() && stack.amount >= Fluid.BUCKET_VOLUME) {
                     BlockPos front = pos.offset(getDirection());
 
                     Block block = stack.getFluid().getBlock();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
index f19698caf..cbbdd7cbf 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java
@@ -92,9 +92,14 @@ public class TileExporter extends TileMultipartNode implements IComparable, ITyp
 
                                 if (took != null) {
                                     int filled = handler.fill(took, false);
-                                    took = network.extractFluid(stack, filled, compare, false);
-                                    handler.fill(took, true);
-                                    break;
+
+                                    if (filled > 0) {
+                                        took = network.extractFluid(stack, filled, compare, false);
+
+                                        handler.fill(took, true);
+
+                                        break;
+                                    }
                                 }
                             }
                         }