diff --git a/server/src/main/java/algorithm/AbstractAlgorithm.kt b/server/src/main/java/algorithm/AbstractAlgorithm.kt
index b23181bcacf..caa9dbe691f 100644
--- a/server/src/main/java/algorithm/AbstractAlgorithm.kt
+++ b/server/src/main/java/algorithm/AbstractAlgorithm.kt
@@ -93,7 +93,7 @@ abstract class AbstractAlgorithm(val thisCar: Car) {
         this.prevState = state
 
         command.distances.forEachIndexed { idx, distance ->
-            thisCar.moveCar(distance, command.directions[idx])
+            thisCar.moveCar(distance, command.directions[idx]).get()
         }
 
         Logger.outDent()
@@ -150,7 +150,7 @@ abstract class AbstractAlgorithm(val thisCar: Car) {
         Logger.log("Inverted cmd: ${invertedCommand.toString()}")
         Logger.outDent()
         invertedCommand.distances.forEachIndexed { idx, distance ->
-            thisCar.moveCar(distance, invertedCommand.directions[idx])
+            thisCar.moveCar(distance, invertedCommand.directions[idx]).get()
         }
     }
 
diff --git a/server/src/main/java/net/web/server/handlers/GetRoomModel.kt b/server/src/main/java/net/web/server/handlers/GetRoomModel.kt
index 073e493dcf0..cd4ab1c1aff 100644
--- a/server/src/main/java/net/web/server/handlers/GetRoomModel.kt
+++ b/server/src/main/java/net/web/server/handlers/GetRoomModel.kt
@@ -46,6 +46,10 @@ class GetRoomModel : Handler {
             vector.length().toInt()
         }.toIntArray()
 
+        if (Environment.map.size == 0) {
+            return DebugResponse.BuilderDebugResponse(begin_x, begin_y, end_x, end_y, 0, 0,
+                    0, pointsX, pointsY, wallDistances).build()
+        }
         val car = Environment.map.values.last()
         return DebugResponse.BuilderDebugResponse(begin_x, begin_y, end_x, end_y, car.x.toInt(), car.y.toInt(),
                 car.angle.toInt(), pointsX, pointsY, wallDistances).build()