diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/Jwt.java b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/Jwt.java
index fa116659b0..967a5f520c 100644
--- a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/Jwt.java
+++ b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/Jwt.java
@@ -27,7 +27,7 @@ import java.util.Map;
  * An implementation of a {@link SecurityToken} representing a <i>JSON Web Token (JWT)</i>.
  *
  * <p>
- * JWTs represent a set of &quot;Claims&quot; as a JSON object that is encoded in a
+ * JWTs represent a set of &quot;Claims&quot; as a JSON object that may be encoded in a
  * <i>JSON Web Signature (JWS)</i> and/or <i>JSON Web Encryption (JWE)</i> structure.
  * The JSON object, also known as the <i>JWT Claims Set</i>, consists of one or more Claim Name/Claim Value pairs.
  * The Claim Name is a <code>String</code> and the Claim Value is an arbitrary JSON object.
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/JwtClaimAccessor.java b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/JwtClaimAccessor.java
index 7ec7ed528f..787029b35e 100644
--- a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/JwtClaimAccessor.java
+++ b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/JwtClaimAccessor.java
@@ -22,8 +22,8 @@ import java.time.Instant;
 import java.util.List;
 
 /**
- * A {@link ClaimAccessor} for the &quot;Registered Claim Names&quot;
- * that may be contained in the JSON object <i>JWT Claims Set</i> of a <i>JSON Web Token (JWT)</i>.
+ * A {@link ClaimAccessor} for the &quot;Claims&quot; that may be contained
+ * in the JSON object <i>JWT Claims Set</i> of a <i>JSON Web Token (JWT)</i>.
  *
  * @author Joe Grandja
  * @since 5.0
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/JwtDecoder.java b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/JwtDecoder.java
index b61976e7f3..8976a5c626 100644
--- a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/JwtDecoder.java
+++ b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/JwtDecoder.java
@@ -34,7 +34,6 @@ package org.springframework.security.jwt;
  * @see <a target="_blank" href="https://tools.ietf.org/html/rfc7515#section-3.1">JWS Compact Serialization</a>
  * @see <a target="_blank" href="https://tools.ietf.org/html/rfc7516#section-3.1">JWE Compact Serialization</a>
  */
-@FunctionalInterface
 public interface JwtDecoder {
 
 	Jwt decode(String token) throws JwtException;
diff --git a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/nimbus/NimbusJwtDecoderJwkSupport.java b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/nimbus/NimbusJwtDecoderJwkSupport.java
index 77e495736d..65cf9359b5 100644
--- a/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/nimbus/NimbusJwtDecoderJwkSupport.java
+++ b/oauth2/jwt-jose/src/main/java/org/springframework/security/jwt/nimbus/NimbusJwtDecoderJwkSupport.java
@@ -72,7 +72,7 @@ public class NimbusJwtDecoderJwkSupport implements JwtDecoder {
 		try {
 			this.jwkSetUrl = new URL(jwkSetUrl);
 		} catch (MalformedURLException ex) {
-			throw new IllegalArgumentException("Invalid JWK Set URL: " + ex.getMessage(), ex);
+			throw new IllegalArgumentException("Invalid JWK Set URL " + jwkSetUrl + " : " + ex.getMessage(), ex);
 		}
 		this.jwsAlgorithm = JWSAlgorithm.parse(jwsAlgorithm);