Improved token handling on auth. failed