Add rescue condition to drive time method
Merge branch 'ux' into development