diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
index 143c87d7f..69c5535f4 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTeleportation.java
@@ -134,6 +134,7 @@ public class ScrollOfTeleportation extends Scroll {
 		
 		if (!(Dungeon.level instanceof RegularLevel)){
 			teleportHero( hero );
+			return;
 		}
 		
 		RegularLevel level = (RegularLevel) Dungeon.level;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRunestoneRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRunestoneRoom.java
index 715fe9e57..35bdb8c10 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRunestoneRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRunestoneRoom.java
@@ -72,7 +72,7 @@ public class SecretRunestoneRoom extends SecretRoom {
 		
 		do{
 			dropPos = level.pointToCell(random());
-		} while (level.map[dropPos] != Terrain.EMPTY && level.heaps.get(dropPos) != null);
+		} while (level.map[dropPos] != Terrain.EMPTY || level.heaps.get(dropPos) != null);
 		level.drop( Generator.random(Generator.Category.STONE), dropPos);
 		
 		do{