diff --git a/pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyAccessor.kt b/pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyAccessor.kt
index 11fe1643..f65bb7bc 100644
--- a/pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyAccessor.kt
+++ b/pgpainless-core/src/main/kotlin/org/pgpainless/key/info/KeyAccessor.kt
@@ -71,7 +71,9 @@ abstract class KeyAccessor(protected val info: KeyRingInfo, protected val key: S
                     return info.latestDirectKeySelfSignature
                 }
 
-                return info.getCurrentSubkeyBindingSignature(key.subkeyId)!!
+                return info.getCurrentSubkeyBindingSignature(key.subkeyId)
+                    ?: throw NoSuchElementException(
+                        "Key does not carry acceptable self-signature signature.")
             }
     }