diff --git a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java
index 8a86e62..a1c2f38 100644
--- a/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java
+++ b/src/main/java/uulm/teamname/marvelous/gamelibrary/gamelogic/GameLogic.java
@@ -711,8 +711,12 @@ public class GameLogic {
         }
 
         for(IntVector2 dir: IntVector2.CardinalDirections) {
-            if(state.entities.findByPosition(start.add(dir)).size() == 0) {
-                options.add(start.add(dir));
+            IntVector2 pos = start.add(dir);
+            if(pos.getX() < 0 || pos.getX() >= state.mapSize.getX() || pos.getY() < 0 || pos.getY() >= state.mapSize.getY()) {
+                return options;
+            }
+            if(state.entities.findByPosition(pos).size() == 0) {
+                options.add(pos);
             }
         }