Merge "Fix the error message for auth token not found."