Try to handle reauthorization flow better and avoid crashes.