diff --git a/src/main/java/com/hbm/blocks/bomb/BlockTaint.java b/src/main/java/com/hbm/blocks/bomb/BlockTaint.java
index 3d24353aa..3b92192de 100644
--- a/src/main/java/com/hbm/blocks/bomb/BlockTaint.java
+++ b/src/main/java/com/hbm/blocks/bomb/BlockTaint.java
@@ -185,7 +185,7 @@ public class BlockTaint extends Block/*Container*/ {
     		}
     	}
     	
-    	if(entity instanceof EntityCreeper) {
+    	if(entity != null && entity.getClass().equals(EntityCreeper.class)) {
     		EntityCreeperTainted creep = new EntityCreeperTainted(world);
     		creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch);
 
diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java
index c78c63b76..81bb45c51 100644
--- a/src/main/java/com/hbm/main/ModEventHandler.java
+++ b/src/main/java/com/hbm/main/ModEventHandler.java
@@ -574,7 +574,7 @@ public class ModEventHandler {
 						
 						float eRad = HbmLivingProps.getRadiation(entity);
 						
-						if(entity instanceof EntityCreeper && eRad >= 200 && entity.getHealth() > 0) {
+						if(entity.getClass().equals(EntityCreeper.class) && eRad >= 200 && entity.getHealth() > 0) {
 							
 							if(event.world.rand.nextInt(3) == 0 ) {
 								EntityCreeperNuclear creep = new EntityCreeperNuclear(event.world);
diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
index 8812d1714..12ec35a76 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
@@ -222,14 +222,20 @@ public class TileEntityMachineRadiolysis extends TileEntityMachineBase implement
 				if(slots[12].stackSize <= 0)
 					slots[12] = null;
 				slots[13] = output;
-				slots[13].stackTagCompound.setBoolean("ntmContagion", false);
+				slots[13].stackTagCompound.removeTag("ntmContagion");
+				if(slots[13].stackTagCompound.hasNoTags()) {
+					slots[13].stackTagCompound = null;
+				}
 			} else if(slots[13].isItemEqual(output) && slots[13].stackSize + output.stackSize <= slots[13].getMaxStackSize()) {
 				slots[12].stackSize -= output.stackSize;
 				if(slots[12].stackSize <= 0)
 					slots[12] = null;
 			
 				slots[13].stackSize += output.stackSize;
-				slots[13].stackTagCompound.setBoolean("ntmContagion", false);
+				slots[13].stackTagCompound.removeTag("ntmContagion");
+				if(slots[13].stackTagCompound.hasNoTags()) {
+					slots[13].stackTagCompound = null;
+				}
 			}
 		}
 	}