diff --git a/src/main/java/noppes/npcs/client/model/part/ModelLegs.java b/src/main/java/noppes/npcs/client/model/part/ModelLegs.java
index 0d87b4512..db997f28e 100644
--- a/src/main/java/noppes/npcs/client/model/part/ModelLegs.java
+++ b/src/main/java/noppes/npcs/client/model/part/ModelLegs.java
@@ -229,6 +229,8 @@ public class ModelLegs extends ModelScaleRenderer{
 	}
     public void setRotationAngles(float par1, float par2, float par3, float par4, float par5, float par6, Entity entity)
     {
+        if(this.entity==null) return;
+
 		ModelPartData part = this.entity.modelData.legParts;
     	rotationPointZ = 0;
     	rotationPointY = 0;
diff --git a/src/main/java/noppes/npcs/client/model/part/ModelTail.java b/src/main/java/noppes/npcs/client/model/part/ModelTail.java
index f8ddd87c6..b80fe6318 100644
--- a/src/main/java/noppes/npcs/client/model/part/ModelTail.java
+++ b/src/main/java/noppes/npcs/client/model/part/ModelTail.java
@@ -82,6 +82,8 @@ public class ModelTail extends ModelScaleRenderer {
 	
 	public void setRotationAngles(float par1, float par2, float par3,
 			float par4, float par5, float par6, Entity entity) {
+		if(this.entity==null) return;
+
 		rotateAngleY = MathHelper.cos(par1 * 0.6662F) * 0.3f * par2;
         rotateAngleX = MathHelper.sin(par3 * 0.067F) * 0.05F;