diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java
index d8461f9b0..6f6dbea4a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/CellSelector.java
@@ -264,6 +264,10 @@ public class CellSelector extends ScrollArea {
 	};
 	
 	private boolean moveFromAction(GameAction action){
+		if (Dungeon.hero == null){
+			return false;
+		}
+
 		int cell = Dungeon.hero.pos;
 
 		if (action == SPDAction.N)  cell += -Dungeon.level.width();