diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/exception/KeyException.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/exception/KeyException.kt
index 56d685c9..584de2ad 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/exception/KeyException.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/exception/KeyException.kt
@@ -38,6 +38,11 @@ abstract class KeyException : RuntimeException {
         ) {
 
         constructor(cert: OpenPGPCertificate, expirationDate: Date) : this(of(cert), expirationDate)
+
+        constructor(
+            componentKey: OpenPGPComponentKey,
+            expirationDate: Date
+        ) : this(of(componentKey), expirationDate)
     }
 
     class RevokedKeyException : KeyException {
diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyRingInfo.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyRingInfo.kt
index 3197dc51..d324b953 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyRingInfo.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyRingInfo.kt
@@ -35,7 +35,8 @@ class KeyRingInfo(
         api: PGPainless = PGPainless.getInstance(),
         referenceDate: Date = Date()
     ) : this(
-        if (keys is PGPSecretKeyRing) OpenPGPKey(keys) else OpenPGPCertificate(keys),
+        if (keys is PGPSecretKeyRing) OpenPGPKey(keys, api.implementation)
+        else OpenPGPCertificate(keys, api.implementation),
         api,
         referenceDate)