diff --git a/src/gameplay/frames/nextFrameBuffer.java b/src/gameplay/frames/nextFrameBuffer.java
index 49c3b06..7c1b8a6 100644
--- a/src/gameplay/frames/nextFrameBuffer.java
+++ b/src/gameplay/frames/nextFrameBuffer.java
@@ -40,8 +40,13 @@ public class nextFrameBuffer {
 	}
 	
 	public void goToNext() {
-		this.current = this.next.current;
-		this.next = this.next.next;
+		try {
+			this.current = this.next.current;
+			this.next = this.next.next;
+		} catch (NullPointerException n) {
+			this.setCurrentFrame(null);
+			this.setNext(new nextFrameBuffer());
+		}
 	}
 	
 	public Frame getCurrentFrame() {
diff --git a/src/gameplay/input/InputBuffer.java b/src/gameplay/input/InputBuffer.java
index d2685cc..097cb4d 100644
--- a/src/gameplay/input/InputBuffer.java
+++ b/src/gameplay/input/InputBuffer.java
@@ -112,7 +112,7 @@ public class InputBuffer {
 		} catch (ArrayIndexOutOfBoundsException e ) {
 			return true;
 		}
-		for(int i = command.length - 2; i <= 0 && ret; i--) {
+		for(int i = command.length - 2; i >= 0 && ret; i--) {
 			backCounter = 1;
 			if(startFrameCount - backCounter < 0) {frameToCheck = this.size - (backCounter - startFrameCount);}
 			else {frameToCheck = startFrameCount - backCounter;}