diff --git a/src/gameplay/entities/Character.java b/src/gameplay/entities/Character.java
index 75a93ae..1baf5f9 100644
--- a/src/gameplay/entities/Character.java
+++ b/src/gameplay/entities/Character.java
@@ -216,7 +216,7 @@ public class Character extends Entity {
 	 * which indicates the character has moved on to the next one
 	 */
 	public void removeFirstAttackPart() {
-		this.nextAttackParts.remove(0);
+		if(this.nextAttackParts.size() > 0) {this.nextAttackParts.remove(0);}
 	}
 	
 	public ArrayList<ThrowPart> getNextThrowParts() {