diff --git a/blender_cloud/gui.py b/blender_cloud/gui.py
index a91bc51..e8d3943 100644
--- a/blender_cloud/gui.py
+++ b/blender_cloud/gui.py
@@ -348,7 +348,7 @@ class BlenderCloudBrowser(bpy.types.Operator):
             self._show_subscribe_screen()
             return
         except pillar.UserNotLoggedInError:
-            self.error('User not logged in on Blender ID.')
+            self.log.error('User not logged in on Blender ID.')
         else:
             self.log.info('Credentials refreshed and ok, browsing assets.')
             await self.async_download_previews()
diff --git a/blender_cloud/pillar.py b/blender_cloud/pillar.py
index 887cade..2124d8a 100644
--- a/blender_cloud/pillar.py
+++ b/blender_cloud/pillar.py
@@ -179,7 +179,7 @@ async def check_pillar_credentials():
 
     try:
         db_user = await pillar_call(pillarsdk.User.find, pillar_user_id)
-    except pillarsdk.UnauthorizedAccess:
+    except (pillarsdk.UnauthorizedAccess, pillarsdk.ResourceNotFound):
         raise CredentialsNotSyncedError()
 
     roles = db_user.roles
@@ -208,7 +208,11 @@ async def refresh_pillar_credentials():
 
     # Create a subclient token and send it to Pillar.
     # May raise a blender_id.BlenderIdCommError
-    blender_id.create_subclient_token(SUBCLIENT_ID, pillar_endpoint)
+    try:
+        blender_id.create_subclient_token(SUBCLIENT_ID, pillar_endpoint)
+    except blender_id.communication.BlenderIdCommError as ex:
+        log.warning("Unable to create authentication token: %s", ex)
+        raise CredentialsNotSyncedError()
 
     # Test the new URL
     _pillar_api = None