diff --git a/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java b/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
index 9b1a1b68..fbef8570 100644
--- a/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
+++ b/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
@@ -102,7 +102,11 @@ public class HorizontalVelocityTracker {
 
 	public static void updateAll() {
 		for (Entity e : instances.keySet())
-			instances.get(e).update();
+			if (e != null) {
+				instances.get(e).update();
+			} else {
+				instances.remove(e);
+			}
 	}
 
 	public void remove() {