diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityMagicConstruct.java b/src/main/java/electroblob/wizardry/entity/construct/EntityMagicConstruct.java
index 414fad02..7b9b11ec 100644
--- a/src/main/java/electroblob/wizardry/entity/construct/EntityMagicConstruct.java
+++ b/src/main/java/electroblob/wizardry/entity/construct/EntityMagicConstruct.java
@@ -103,15 +103,15 @@ public abstract class EntityMagicConstruct extends Entity implements IEntityOwna
 
 	@Override
 	protected void readEntityFromNBT(NBTTagCompound nbttagcompound){
-		casterUUID = nbttagcompound.getUniqueId("casterUUID");
+		if(nbttagcompound.hasUniqueId("casterUUID")) casterUUID = nbttagcompound.getUniqueId("casterUUID");
 		lifetime = nbttagcompound.getInteger("lifetime");
 		damageMultiplier = nbttagcompound.getFloat("damageMultiplier");
 	}
 
 	@Override
 	protected void writeEntityToNBT(NBTTagCompound nbttagcompound){
-		if(this.getCaster() != null){
-			nbttagcompound.setUniqueId("casterUUID", this.getCaster().getUniqueID());
+		if(casterUUID != null){
+			nbttagcompound.setUniqueId("casterUUID", casterUUID);
 		}
 		nbttagcompound.setInteger("lifetime", lifetime);
 		nbttagcompound.setFloat("damageMultiplier", damageMultiplier);
diff --git a/src/main/java/electroblob/wizardry/tileentity/TileEntityPlayerSave.java b/src/main/java/electroblob/wizardry/tileentity/TileEntityPlayerSave.java
index 2cb0fa43..934f2d68 100644
--- a/src/main/java/electroblob/wizardry/tileentity/TileEntityPlayerSave.java
+++ b/src/main/java/electroblob/wizardry/tileentity/TileEntityPlayerSave.java
@@ -29,7 +29,7 @@ public class TileEntityPlayerSave extends TileEntity {
 	@Override
 	public void readFromNBT(NBTTagCompound tagCompound){
 		super.readFromNBT(tagCompound);
-		casterUUID = tagCompound.getUniqueId("casterUUID");
+		if(tagCompound.hasUniqueId("casterUUID")) casterUUID = tagCompound.getUniqueId("casterUUID");
 	}
 
 	@Override
@@ -37,7 +37,7 @@ public class TileEntityPlayerSave extends TileEntity {
 
 		super.writeToNBT(tagCompound);
 
-		if(this.getCaster() != null){
+		if(casterUUID != null){
 			tagCompound.setUniqueId("casterUUID", casterUUID);
 		}