diff --git a/funkwhale_cli/cli.py b/funkwhale_cli/cli.py
index c3170d0130f80a7ea4d4fdcde6672aee5cd01059..c9719c96ee4f660c5f8dc9be739aa4a854d89971 100644
--- a/funkwhale_cli/cli.py
+++ b/funkwhale_cli/cli.py
@@ -206,7 +206,12 @@ async def login(ctx, username, password):
             session, ctx.obj["SERVER_URL"], username=username, password=password
         )
 
-    keyring.set_password(ctx.obj["SERVER_URL"], "_", token)
+    try:
+        keyring.set_password(ctx.obj["SERVER_URL"], "_", token)
+    except ValueError as e:
+        raise click.ClickException("Error while retrieving password from keyring: {}. Your password may be incorrect.".format(e.args[0]))
+    except Exception as e:
+        raise click.ClickException("Error while retrieving password from keyring: {}".format(e.args[0]))
     click.echo("Login successfull!")