diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 2f1c3df..90bacad 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -638,7 +638,7 @@
                 if (url != null && url.startsWith("http")) {
                     final Bundle pairs = intent
                             .getBundleExtra(Browser.EXTRA_HEADERS);
-                    if (!pairs.isEmpty()) {
+                    if (pairs != null && !pairs.isEmpty()) {
                         Iterator<String> iter = pairs.keySet().iterator();
                         headers = new HashMap<String, String>();
                         while (iter.hasNext()) {