Better route handling, but still fails when no directions available.