Improved route lost handling