Merge "Handle BadTokenException exception more reliably."