diff --git a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionOptions.java b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionOptions.java
index 13131f08..8d7098d3 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionOptions.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/encryption_signing/EncryptionOptions.java
@@ -258,6 +258,8 @@ public class EncryptionOptions {
             throws BadDataException, BadNameException, IOException {
         String fingerprint = certificateFingerprint.toString().toLowerCase();
         Certificate certificateRecord = certificateStore.getCertificate(fingerprint);
+        // TODO: getCertificate throws NSEE automatically in 0.2.2+
+        //  Remove if statement below when bumping
         if (certificateRecord == null) {
             throw new NoSuchElementException("Cannot find certificate '" + certificateFingerprint + "'");
         }