Update to better handle access token exception