diff --git a/flatland/envs/rail_env.py b/flatland/envs/rail_env.py
index cc115c72fe42ec17c95f69261b906f3958b89736..ddd8e442dc77fff3b2792ab5538401ec3a570bae 100644
--- a/flatland/envs/rail_env.py
+++ b/flatland/envs/rail_env.py
@@ -395,8 +395,6 @@ class RailEnv(Environment):
                             self.rewards_dict[i_agent] += self.step_penalty * agent.speed_data['speed']
                             self.rewards_dict[i_agent] += self.stop_penalty
                             agent.moving = False
-                else:
-                    agent.speed_data['transition_action_on_cellexit'] = action
 
             # if we've just broken in this step, nothing else to do
             if new_malfunction:
diff --git a/flatland/envs/rail_generators.py b/flatland/envs/rail_generators.py
index 7515009c1d7168387fa0721feb6b1e7f18b8edbd..5af4a079b1b6d210a395896df5d577c1c7a16267 100644
--- a/flatland/envs/rail_generators.py
+++ b/flatland/envs/rail_generators.py
@@ -682,6 +682,7 @@ def sparse_rail_generator(num_cities=5, num_intersections=4, num_trainstations=2
                     if tries > 100:
                         warnings.warn("Could not set trainstations, please change initial parameters!!!!")
                         spot_found = False
+                        break
 
                 if spot_found:
                     train_stations[trainstation_node].append((station_x, station_y))