From 7aa2617a9643d76c0a0b5e639422b6b2dc4c7fb7 Mon Sep 17 00:00:00 2001
From: Ben Spiers <ben.spiers22@gmail.com>
Date: Mon, 1 Sep 2014 20:17:55 +0100
Subject: [PATCH] Continue the attempting to be killing the bug with the
 fire...

---
 src/main/java/mekanism/common/FluidNetwork.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java
index 7635d9ef7..982efc17b 100644
--- a/src/main/java/mekanism/common/FluidNetwork.java
+++ b/src/main/java/mekanism/common/FluidNetwork.java
@@ -179,7 +179,10 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 						remaining--;
 					}
 
-					fluidSent += acceptor.fill(acceptorDirections.get(acceptor).getOpposite(), new FluidStack(fluidToSend.fluidID, currentSending), doTransfer);
+					if(acceptorDirections.get(acceptor) != null && fluidToSend != null)
+					{
+						fluidSent += acceptor.fill(acceptorDirections.get(acceptor).getOpposite(), new FluidStack(fluidToSend.fluidID, currentSending), doTransfer);
+					}
 				}
 			}
 		}