diff --git a/build.properties b/build.properties
index dbb3000f..78ddcc8c 100644
--- a/build.properties
+++ b/build.properties
@@ -1,5 +1,5 @@
 #
-#Thu Feb 26 20:41:21 EST 2015
+#Fri Feb 27 09:41:14 EST 2015
 mod_name=BloodMagic
 forge_version=10.13.2.1232
 ccc_version=1.0.4.29
@@ -8,5 +8,5 @@ nei_version=1.0.3.64
 package_group=com.wayoftime.bloodmagic
 mod_version=1.3.1Beta1
 minetweaker_version=Dev-1.7.10-3.0.9B
-build_number=10
+build_number=12
 mc_version=1.7.10
diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java
index e8426d14..528e7b75 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipeRegistry.java
@@ -33,6 +33,11 @@ public class AltarRecipeRegistry
 
     public static boolean isRequiredItemValid(ItemStack testItem, int currentTierAltar)
     {
+    	if(testItem == null)
+    	{
+    		return false;
+    	}
+    	
         for (AltarRecipe recipe : altarRecipes)
         {
             if (recipe.doesRequiredItemMatch(testItem, currentTierAltar))
diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java
index 4c5e10bd..fc68170e 100644
--- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java
+++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java
@@ -69,7 +69,7 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
     private int lockdownDuration;
     private int demonBloodDuration;
     
-    private int cooldownAfterCrafting = 0;
+    private int cooldownAfterCrafting = 500;
 
     public TEAltar()
     {
@@ -584,6 +584,11 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
             this.lockdownDuration--;
         }
 
+        if(worldObj.isRemote)
+        {
+        	return;
+        }
+        
         if (!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0)
         {
             {
@@ -647,8 +652,8 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
             this.fluidOutput.amount += fluidOutputted;
             this.fluid.amount -= fluidOutputted;
         }
-
-        if (worldObj.getWorldTime() % 100 == 0 && this.cooldownAfterCrafting <= 0)
+        
+        if (worldObj.getWorldTime() % 100 == 0 && (this.isActive || this.cooldownAfterCrafting <= 0))
         {
             startCycle();
         }
@@ -866,11 +871,6 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui
             return;
         }
 
-        if (getStackInSlot(0) == null)
-        {
-            return;
-        }
-
         if (!isActive)
         {
             progress = 0;