Should check for null AccessToken

Like master