1 files changed, 8 insertions, 1 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java
index 6661ac47b81..eba89b72d87 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java
@@ -5,6 +5,7 @@ import com.yahoo.vespa.athenz.api.AthenzService;
 
 import java.net.URL;
 import java.time.Instant;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
@@ -21,7 +22,13 @@ public record SignedIdentityDocument(String signature, int signingKeyVersion, Ve
 
     public SignedIdentityDocument {
         ipAddresses = Set.copyOf(ipAddresses);
-        unknownAttributes = Map.copyOf(unknownAttributes);
+
+        Map<String, Object> nonNull = new HashMap<>();
+        unknownAttributes.forEach((key, value) -> {
+            if (value != null) nonNull.put(key, value);
+        });
+        // Map.copyOf() does not allow null values
+        unknownAttributes = Map.copyOf(nonNull);
     }
 
     public SignedIdentityDocument(String signature, int signingKeyVersion, VespaUniqueInstanceId providerUniqueId,