From aff752f8026f24edaedfb0797988feda163f9ff9 Mon Sep 17 00:00:00 2001
From: Chinmay Garde <chinmaygarde@gmail.com>
Date: Mon, 9 May 2016 12:53:09 -0700
Subject: [PATCH] mojo_client: Dont try to iterate over response headers if
 there aren't any. (#3811)

---
 packages/flutter/lib/src/http/mojo_client.dart | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/flutter/lib/src/http/mojo_client.dart b/packages/flutter/lib/src/http/mojo_client.dart
index ada1e3c7133..d61b6a72dbd 100644
--- a/packages/flutter/lib/src/http/mojo_client.dart
+++ b/packages/flutter/lib/src/http/mojo_client.dart
@@ -180,10 +180,12 @@ class MojoClient {
       ByteData data = await mojo.DataPipeDrainer.drainHandle(response.body);
       Uint8List bodyBytes = new Uint8List.view(data.buffer);
       Map<String, String> headers = <String, String>{};
-      for (mojom.HttpHeader header in response.headers) {
-        String headerName = header.name.toLowerCase();
-        String existingValue = headers[headerName];
-        headers[headerName] = existingValue != null ? '$existingValue, ${header.value}' : header.value;
+      if (response.headers != null) {
+        for (mojom.HttpHeader header in response.headers) {
+          String headerName = header.name.toLowerCase();
+          String existingValue = headers[headerName];
+          headers[headerName] = existingValue != null ? '$existingValue, ${header.value}' : header.value;
+        }
       }
       return new Response.bytes(bodyBytes, response.statusCode, headers: headers);
     } catch (exception, stack) {