improve Drone exit conditions.