diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java
index 16de7c9..c80ccbc 100644
--- a/src/de/teamteamteam/spacescooter/entity/Player.java
+++ b/src/de/teamteamteam/spacescooter/entity/Player.java
@@ -30,6 +30,7 @@ public class Player extends ShootingEntity implements KeyboardListener {
 	}
 
 	public void update() {
+		super.update();
 		if(this.canMove) {
 			super.update();
 			int off = 3;
@@ -62,8 +63,10 @@ public class Player extends ShootingEntity implements KeyboardListener {
 	 */
 	@Override
 	public void remove() {
-		this.keyboard.removeListener(this);
-		this.keyboard = null;
+		if(this.keyboard != null) {
+			this.keyboard.removeListener(this);
+			this.keyboard = null;
+		}
 		super.remove();
 	}