diff --git a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java
index 4ce2a350c..c01a48f45 100644
--- a/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java
+++ b/src/main/java/mekanism/client/model/ModelElectrolyticSeparator.java
@@ -16,7 +16,7 @@ public class ModelElectrolyticSeparator extends ModelBase
 	ModelRenderer tube4;
 	ModelRenderer tube3;
 	ModelRenderer tube2;
-	ModelRenderer tube1;
+	ModelRenderer tube1; 
 	ModelRenderer base;
 	ModelRenderer portToggle1;
 	ModelRenderer portToggle2a;
diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
index f8ec352a4..f916381b5 100644
--- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
+++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java
@@ -108,7 +108,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen
 				}
 			}
 			
-			if(MekanismUtils.canFunction(this) && getEnergy() >= energyPerTick && fluidTank.getFluid().getFluid().canBePlacedInWorld())
+			if(MekanismUtils.canFunction(this) && getEnergy() >= energyPerTick && fluidTank.getFluid() != null && fluidTank.getFluid().getFluid().canBePlacedInWorld())
 			{
 				if(!finishedCalc)
 				{
diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java
index 51f8c2c76..891968aa1 100644
--- a/src/main/java/mekanism/common/util/MekanismUtils.java
+++ b/src/main/java/mekanism/common/util/MekanismUtils.java
@@ -515,6 +515,11 @@ public final class MekanismUtils
 	 */
 	public static int getBaseOrientation(int side, int blockFacing)
 	{
+		if(side == 0 || side == 1)
+		{
+			return side;
+		}
+		
 		if(blockFacing == 3 || side == 1 || side == 0)
 		{
 			if(side == 2 || side == 3)