diff --git a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java b/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java index 8e54ec4..e3110ec 100644 --- a/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java +++ b/src/main/java/com/github/nkzawa/engineio/client/transports/PollingXHR.java @@ -201,10 +201,15 @@ public class PollingXHR extends Polling { } Map headers = new TreeMap(String.CASE_INSENSITIVE_ORDER); - for (String key : xhr.getHeaderFields().keySet()) { - if (key == null) continue; - headers.put(key, xhr.getHeaderField(key)); + + Map> xhrHeaderFields = xhr.getHeaderFields(); + if(xhrHeaderFields != null) { + for (String key : xhrHeaderFields.keySet()) { + if (key == null) continue; + headers.put(key, xhr.getHeaderField(key)); + } } + self.onResponseHeaders(headers); final int statusCode = xhr.getResponseCode();