rotation during departures query: npe fixed