diff --git a/rmf_traffic/src/rmf_traffic/agv/planning/DifferentialDrivePlanner.cpp b/rmf_traffic/src/rmf_traffic/agv/planning/DifferentialDrivePlanner.cpp
index 419a4e5e..d2a86117 100644
--- a/rmf_traffic/src/rmf_traffic/agv/planning/DifferentialDrivePlanner.cpp
+++ b/rmf_traffic/src/rmf_traffic/agv/planning/DifferentialDrivePlanner.cpp
@@ -941,7 +941,7 @@ class ScheduledDifferentialDriveExpander
     const auto& wp = _supergraph->original().waypoints[target_waypoint_index];
     const Eigen::Vector2d wp_location = wp.get_location();
 
-    SearchNodePtr node = top;
+    SearchNodePtr parent = top;
     if (start.lane().has_value() && start.location().has_value())
     {
       const auto lane_index = start.lane().value();
@@ -954,30 +954,30 @@ class ScheduledDifferentialDriveExpander
         Trajectory hold;
         Eigen::Vector3d p_start = {p.x(), p.y(), start.orientation()};
         const auto zero = Eigen::Vector3d::Zero();
-        hold.insert(node->time, p_start, zero);
-        hold.insert(node->time + entry_event->duration(), p_start, zero);
+        hold.insert(parent->time, p_start, zero);
+        hold.insert(parent->time + entry_event->duration(), p_start, zero);
         Route route{wp.get_map_name(), std::move(hold)};
-        if (_validator && !is_valid(node, route))
+        if (_validator && !is_valid(parent, route))
         {
           // If we cannot wait for the entry event to happen then this is not a
           // feasible start.
           return;
         }
 
-        node = std::make_shared<SearchNode>(
+        parent = std::make_shared<SearchNode>(
           SearchNode{
             std::nullopt,
             top->waypoint,
             {},
             p,
             start.orientation(),
-            node->time + entry_event->duration(),
-            node->remaining_cost_estimate,
+            parent->time + entry_event->duration(),
+            parent->remaining_cost_estimate,
             {std::move(route)},
             std::move(entry_event),
-            node->current_cost + event_cost,
+            parent->current_cost + event_cost,
             std::nullopt,
-            node,
+            parent,
           __LINE__
           });
       }
@@ -991,7 +991,7 @@ class ScheduledDifferentialDriveExpander
     assert(start.location().has_value());
 
     const auto approach_info = make_start_approach_trajectories(
-      top->start.value(), node->current_cost);
+      top->start.value(), parent->current_cost);
 
     if (approach_info.trajectories.empty())
     {
@@ -1041,7 +1041,7 @@ class ScheduledDifferentialDriveExpander
       for (const auto& map : map_names)
       {
         Route route{map, approach_trajectory};
-        if (_validator && !is_valid(node, route))
+        if (_validator && !is_valid(parent, route))
         {
           all_valid = false;
           break;
@@ -1065,7 +1065,7 @@ class ScheduledDifferentialDriveExpander
         for (const auto& map : map_names)
         {
           Route route{map, hold};
-          if (_validator && !is_valid(node, route))
+          if (_validator && !is_valid(parent, route))
           {
             all_valid = false;
             break;
@@ -1085,7 +1085,7 @@ class ScheduledDifferentialDriveExpander
       // TODO(MXG): We can actually specify the orientation for this. We just
       // need to be smarter with make_start_approach_trajectories(). We should
       // really have it return a Traversal.
-      node = std::make_shared<SearchNode>(
+      auto node = std::make_shared<SearchNode>(
         SearchNode{
           std::nullopt,
           target_waypoint_index,
@@ -1093,12 +1093,12 @@ class ScheduledDifferentialDriveExpander
           wp_location,
           approach_yaw,
           approach_time,
-          node->remaining_cost_estimate - approach_cost,
+          parent->remaining_cost_estimate - approach_cost,
           std::move(approach_routes),
           exit_event,
-          node->current_cost + approach_cost,
+          parent->current_cost + approach_cost,
           std::nullopt,
-          node,
+          parent,
           __LINE__
         });
 
@@ -2045,7 +2045,7 @@ class ScheduledDifferentialDriveExpander
     for (const auto& void_node : nodes)
     {
       bool skip = false;
-      const auto original_node =
+      auto original_node =
         std::static_pointer_cast<SearchNode>(void_node.first);
 
       const auto original_t = void_node.second;
@@ -2080,6 +2080,14 @@ class ScheduledDifferentialDriveExpander
       if (skip)
         continue;
 
+      while (original_node && !original_node->waypoint.has_value() && !original_node->start.has_value())
+      {
+        original_node = original_node->parent;
+      }
+
+      if (!original_node)
+        continue;
+
       rollout_queue.emplace_back(
         RolloutEntry{
           original_t,