diff --git a/src/main/java/noppes/npcs/controllers/data/Animation.java b/src/main/java/noppes/npcs/controllers/data/Animation.java
index 404991444..0950ee42d 100644
--- a/src/main/java/noppes/npcs/controllers/data/Animation.java
+++ b/src/main/java/noppes/npcs/controllers/data/Animation.java
@@ -255,9 +255,13 @@ public class Animation implements IAnimation {
 	public void jumpToCurrentFrame() {
 		this.currentFrameTime = 0;
 		Frame frame = (Frame) this.currentFrame();
-		for (EnumAnimationPart part : EnumAnimationPart.values()) {
-			if (frame.frameParts.containsKey(part)) {
-				frame.frameParts.get(part).jumpToCurrentFrame();
+		if(frame != null){
+			for (EnumAnimationPart part : EnumAnimationPart.values()) {
+				if(part != null){
+					if (frame.frameParts.containsKey(part)) {
+						frame.frameParts.get(part).jumpToCurrentFrame();
+					}
+				}
 			}
 		}
 	}