diff --git a/src/app/_interceptors/error.interceptor.ts b/src/app/_interceptors/error.interceptor.ts
index c2fdd6a..9763c8d 100644
--- a/src/app/_interceptors/error.interceptor.ts
+++ b/src/app/_interceptors/error.interceptor.ts
@@ -21,7 +21,6 @@ export class ErrorInterceptor implements HttpInterceptor {
 
   intercept(request: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
     return next.handle(request).pipe(
-      retry(1),
       catchError((err: HttpErrorResponse) => {
         let errorMessage;
         if (err.error instanceof ErrorEvent) {
diff --git a/src/app/_pgp/pgp-key-store.ts b/src/app/_pgp/pgp-key-store.ts
index b3ab744..0b27f9f 100644
--- a/src/app/_pgp/pgp-key-store.ts
+++ b/src/app/_pgp/pgp-key-store.ts
@@ -72,7 +72,7 @@ class MutablePgpKeyStore implements MutableKeyStore{
   }
 
   getPrivateKey(): any {
-    return keyring.privateKeys.keys[0];
+    return keyring.privateKeys && keyring.privateKeys.keys[0];
   }
 
   async isValidKey(key): Promise<boolean> {
@@ -94,7 +94,8 @@ class MutablePgpKeyStore implements MutableKeyStore{
 
   getFingerprint(): string {
     // TODO Handle multiple keys
-    return keyring.privateKeys.keys[0].keyPacket.fingerprint;
+    return keyring.privateKeys && keyring.privateKeys.keys[0] && keyring.privateKeys.keys[0].keyPacket &&
+      keyring.privateKeys.keys[0].keyPacket.fingerprint;
   }
 
   getKeyId(key: any): string {