1 files changed, 3 insertions, 0 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java
index 8dcf61911dd..355a80d40aa 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/Cookie.java
@@ -1,6 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.jdisc.http;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -225,6 +226,7 @@ public class Cookie {
     }
 
     public static List<Cookie> fromCookieHeader(String headerVal) {
+        if (headerVal == null) return Collections.emptyList();
         return decodeCookies(headerVal);
     }
 
@@ -233,6 +235,7 @@ public class Cookie {
     }
 
     public static List<Cookie> fromSetCookieHeader(String headerVal) {
+        if (headerVal == null) return Collections.emptyList();
         return decodeCookies(headerVal);
     }