Improve error message

2 files changed, 2 insertions, 2 deletions

diff --git a/security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java b/security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java
index a28dab16d08..5292b70a43f 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/ConnectionAuthContext.java
@@ -73,7 +73,7 @@ public record ConnectionAuthContext(List<X509Certificate> peerCertificateChain,
         }
         b.append(". Peer ");
         if (peer != null) b.append("'").append(peer).append("' ");
-        return b.append("with ").append(peerCertificateString()).append(". Requires capabilities ")
+        return b.append("with ").append(peerCertificateString().orElse("<missing-certificate>")).append(". Requires capabilities ")
                 .append(required.toNames()).append(" but peer has ").append(capabilities.toNames())
                 .append(".").toString();
     }
diff --git a/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java b/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java
index 8036bc38d90..92caa2d7aaa 100644
--- a/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java
+++ b/security-utils/src/test/java/com/yahoo/security/tls/ConnectionAuthContextTest.java
@@ -33,7 +33,7 @@ class ConnectionAuthContextTest {
         ConnectionAuthContext ctx = createConnectionAuthContext();
         CapabilitySet requiredCaps = CapabilitySet.from(Capability.CONTENT__STATUS_PAGES);
         String expectedMessage = """
-                Permission denied for 'myaction' on 'myresource'. Peer 'mypeer' with Optional[[CN='myidentity']].
+                Permission denied for 'myaction' on 'myresource'. Peer 'mypeer' with [CN='myidentity'].
                 Requires capabilities [vespa.content.status_pages] but peer has
                 [vespa.content.document_api, vespa.content.search_api, vespa.slobrok.api].
                 """;