From b0c2f5fe0ef881196985f254372aead2fbfba76a Mon Sep 17 00:00:00 2001
From: Eugene <inbox@null.page>
Date: Fri, 8 May 2026 10:32:12 +0200
Subject: [PATCH] handle keytar password load errors

---
 tabby-ssh/src/services/passwordStorage.service.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tabby-ssh/src/services/passwordStorage.service.ts b/tabby-ssh/src/services/passwordStorage.service.ts
index d9071450..f34b00df 100644
--- a/tabby-ssh/src/services/passwordStorage.service.ts
+++ b/tabby-ssh/src/services/passwordStorage.service.ts
@@ -48,7 +48,12 @@ export class PasswordStorageService {
                 return null
             }
             const key = this.getKeytarKeyForConnection(profile)
-            return keytar.getPassword(key, account)
+            try {
+                return await keytar.getPassword(key, account)
+            } catch (e) {
+                console.warn(`Failed to load stored password for ${account}@${profile.options.host}:${profile.options.port ?? 22}`, e)
+                return null
+            }
         }
     }