1 files changed, 2 insertions, 6 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/Capability.java b/security-utils/src/main/java/com/yahoo/security/tls/Capability.java
index e60598a9dc2..6a6471aa8ac 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/Capability.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/Capability.java
@@ -2,6 +2,7 @@
 package com.yahoo.security.tls;
 
 import java.util.Arrays;
+import java.util.Optional;
 
 /**
  * @author bjorncs
@@ -48,11 +49,6 @@ public enum Capability implements ToCapabilitySet {
 
     @Override public CapabilitySet toCapabilitySet() { return CapabilitySet.of(this); }
 
-    public static Capability fromName(String name) {
-        return Arrays.stream(values())
-                .filter(c -> c.name.equals(name))
-                .findAny().orElseThrow(() ->
-                        new IllegalArgumentException("Cannot find predefined capability set with name '" + name + "'"));
-    }
+    public static Optional<Capability> fromName(String n) { return Arrays.stream(values()).filter(c -> c.name.equals(n)).findAny(); }
 
 }