1 files changed, 5 insertions, 1 deletions
diff --git a/cloud/core/src/key.ts b/cloud/core/src/key.ts
index a8bcec401..28643a521 100644
--- a/cloud/core/src/key.ts
+++ b/cloud/core/src/key.ts
@@ -41,7 +41,11 @@ export namespace Key {
         key: secretKey,
         timeUsed: null,
       }),
-    )
+    ).catch((e: any) => {
+      if (e.message.match(/Duplicate entry '.*' for key 'key.name'/))
+        throw new Error("A key with this name already exists. Please choose a different name.")
+      throw e
+    })
 
     return keyID
   })