Improve handling of invalid auth tokens