diff --git a/src/securejoin.rs b/src/securejoin.rs
index 8bbbac1d9..c8c37675c 100644
--- a/src/securejoin.rs
+++ b/src/securejoin.rs
@@ -65,8 +65,8 @@ pub async fn get_securejoin_qr(context: &Context, group: Option<ChatId>) -> Resu
     let sync_token = token::lookup(context, Namespace::InviteNumber, group)
         .await?
         .is_none();
-    let invitenumber = token::lookup_or_new(context, Namespace::InviteNumber, group).await;
-    let auth = token::lookup_or_new(context, Namespace::Auth, group).await;
+    let invitenumber = token::lookup_or_new(context, Namespace::InviteNumber, group).await?;
+    let auth = token::lookup_or_new(context, Namespace::Auth, group).await?;
     let self_addr = context.get_primary_self_addr().await?;
     let self_name = context
         .get_config(Config::Displayname)
diff --git a/src/token.rs b/src/token.rs
index 8b47d2326..63f97175e 100644
--- a/src/token.rs
+++ b/src/token.rs
@@ -93,14 +93,14 @@ pub async fn lookup_or_new(
     context: &Context,
     namespace: Namespace,
     foreign_id: Option<ChatId>,
-) -> String {
-    if let Ok(Some(token)) = lookup(context, namespace, foreign_id).await {
-        return token;
+) -> Result<String> {
+    if let Some(token) = lookup(context, namespace, foreign_id).await? {
+        return Ok(token);
     }
 
     let token = create_id();
-    save(context, namespace, foreign_id, &token).await.ok();
-    token
+    save(context, namespace, foreign_id, &token).await?;
+    Ok(token)
 }
 
 pub async fn exists(context: &Context, namespace: Namespace, token: &str) -> Result<bool> {