diff --git a/src/main/scala/li/cil/oc/server/component/robot/Robot.scala b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala
index 2fad0622b..ecc22a229 100644
--- a/src/main/scala/li/cil/oc/server/component/robot/Robot.scala
+++ b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala
@@ -607,7 +607,10 @@ class Robot(val robot: tileentity.Robot) extends ManagedComponent {
           case _ =>
             val blockId = world.getBlockId(x + facing.offsetX, y + facing.offsetY, z + facing.offsetZ)
             val fluid = FluidRegistry.lookupFluidForBlock(Block.blocksList(blockId))
-            if (tank.fill(new FluidStack(fluid, 1000), false) == 1000) {
+            if (fluid == null) {
+              result(Unit, "incompatible or no fluid")
+            }
+            else if (tank.fill(new FluidStack(fluid, 1000), false) == 1000) {
               tank.fill(new FluidStack(fluid, 1000), true)
               world.setBlockToAir(x + facing.offsetX, y + facing.offsetY, z + facing.offsetZ)
               result(true)