diff --git a/local.properties b/local.properties
new file mode 100644
index 00000000..84440140
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Apr 04 22:58:31 CEST 2022
+sdk.dir=/Users/pbarabas/Library/Android/sdk
diff --git a/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/SignatureValidator.java b/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/SignatureValidator.java
index 3572fff0..51bfa7c3 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/SignatureValidator.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/signature/consumer/SignatureValidator.java
@@ -461,7 +461,7 @@ public abstract class SignatureValidator {
                     if (!valid) {
                         throw new SignatureValidationException("Signature is not correct.");
                     }
-                } catch (PGPException e) {
+                } catch (PGPException | ClassCastException e) {
                     throw new SignatureValidationException("Cannot verify subkey binding signature correctness", e);
                 }
             }
@@ -485,7 +485,7 @@ public abstract class SignatureValidator {
                     if (!valid) {
                         throw new SignatureValidationException("Primary Key Binding Signature is not correct.");
                     }
-                } catch (PGPException e) {
+                } catch (PGPException | ClassCastException e) {
                     throw new SignatureValidationException("Cannot verify primary key binding signature correctness", e);
                 }
             }
@@ -514,7 +514,7 @@ public abstract class SignatureValidator {
                     if (!valid) {
                         throw new SignatureValidationException("Signature is not correct.");
                     }
-                } catch (PGPException e) {
+                } catch (PGPException | ClassCastException e) {
                     throw new SignatureValidationException("Cannot verify direct-key signature correctness", e);
                 }
             }
@@ -577,7 +577,7 @@ public abstract class SignatureValidator {
                     if (!valid) {
                         throw new SignatureValidationException("Signature over user-id '" + userId + "' is not correct.");
                     }
-                } catch (PGPException e) {
+                } catch (PGPException | ClassCastException e) {
                     throw new SignatureValidationException("Cannot verify signature over user-id '" + userId + "'.", e);
                 }
             }
@@ -602,7 +602,7 @@ public abstract class SignatureValidator {
                     if (!valid) {
                         throw new SignatureValidationException("Signature over user-attribute vector is not correct.");
                     }
-                } catch (PGPException e) {
+                } catch (PGPException | ClassCastException e) {
                     throw new SignatureValidationException("Cannot verify signature over user-attribute vector.", e);
                 }
             }
diff --git a/pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/SelectUserId.java b/pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/SelectUserId.java
index e86e59f3..635b9053 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/SelectUserId.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/util/selection/userid/SelectUserId.java
@@ -134,7 +134,7 @@ public abstract class SelectUserId {
      * Note: This only accepts user-ids which properly have the email address surrounded by angle brackets.
      *
      * The argument <pre>email</pre> can both be a plain email address (<pre>"foo@bar.baz"</pre>),
-     * or surrounded by angle brackets (<pre>"<foo@bar.baz>"</pre>, the result of the filter will be the same.
+     * or surrounded by angle brackets (<pre>"foo@bar.baz"</pre>, the result of the filter will be the same.
      *
      * @param email email address
      * @return filter
@@ -181,7 +181,7 @@ public abstract class SelectUserId {
     }
 
     /**
-     * Filter that filters for user-ids which pass at least one of the given <pre>filters</pre>>.
+     * Filter that filters for user-ids which pass at least one of the given <pre>filters</pre>.
      *
      * @param filters filters
      * @return filter