1 files changed, 7 insertions, 3 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/https/TlsAwareHttpClientBuilder.java b/security-utils/src/main/java/com/yahoo/security/tls/https/TlsAwareHttpClientBuilder.java
index 9d2e549e338..5a375cf663f 100644
--- a/security-utils/src/main/java/com/yahoo/security/tls/https/TlsAwareHttpClientBuilder.java
+++ b/security-utils/src/main/java/com/yahoo/security/tls/https/TlsAwareHttpClientBuilder.java
@@ -23,10 +23,14 @@ public class TlsAwareHttpClientBuilder implements HttpClient.Builder {
     private final HttpClient.Builder wrappedBuilder;
     private final String userAgent;
 
+    public TlsAwareHttpClientBuilder(String userAgent) {
+        this(null, userAgent);
+    }
+
     public TlsAwareHttpClientBuilder(TlsContext tlsContext, String userAgent) {
-        this.wrappedBuilder = HttpClient.newBuilder()
-                .sslContext(tlsContext.context())
-                .sslParameters(tlsContext.parameters());
+        this.wrappedBuilder = tlsContext != null ?
+                HttpClient.newBuilder().sslContext(tlsContext.context()).sslParameters(tlsContext.parameters()) :
+                HttpClient.newBuilder();
         this.userAgent = userAgent;
     }