diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java
index 10dce1d6c..af752fd6a 100644
--- a/src/main/java/mekanism/common/FluidNetwork.java
+++ b/src/main/java/mekanism/common/FluidNetwork.java
@@ -327,7 +327,7 @@ public class FluidNetwork extends DynamicNetwork<IFluidHandler, FluidNetwork>
 
 			for(ForgeDirection side : sides)
 			{
-				if(acceptor.canFill(side.getOpposite(), fluidToSend.getFluid()))
+				if(acceptor != null && acceptor.canFill(side.getOpposite(), fluidToSend.getFluid()))
 				{
 					toReturn.add(acceptor);
 					break;
diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
index 8157cc578..3b27ec253 100644
--- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
+++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
@@ -387,7 +387,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I
 	{
 		MinerFilter filter = replaceMap.get(index);
 		
-		if(filter.replaceStack == null)
+		if(filter == null || filter.replaceStack == null)
 		{
 			return null;
 		}