diff --git a/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java b/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java
index 04b53c8a7..a09acbac5 100644
--- a/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java
+++ b/src/main/java/noppes/npcs/entity/EntityMagicProjectile.java
@@ -9,23 +9,28 @@ import net.minecraft.world.World;
 public class EntityMagicProjectile extends EntityProjectile{
 	private EntityPlayer player;
 	private ItemStack equiped;
+
+	public EntityMagicProjectile(World par1World){
+		super(par1World);
+	}
+
 	public EntityMagicProjectile(World par1World,
-			EntityPlayer player, ItemStack item, boolean isNPC) {
+								 EntityPlayer player, ItemStack item, boolean isNPC) {
 		super(par1World, player, item, isNPC);
-		
+
 		this.player = player;
 		this.equiped = player.inventory.getCurrentItem();
 	}
 
 	@Override
 	public void onUpdate(){
-		if(player.inventory.getCurrentItem() != equiped)
+		if(!worldObj.isRemote && (player == null || player.inventory.getCurrentItem() != equiped))
 			this.setDead();
 		super.onUpdate();
 	}
-	
+
 	@Override
-    public String getCommandSenderName(){
-        return StatCollector.translateToLocal("entity.throwableitem.name");
-    }
+	public String getCommandSenderName(){
+		return StatCollector.translateToLocal("entity.throwableitem.name");
+	}
 }