--- a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java
@@ -585,18 +585,26 @@ public final class IntentHelper implemen
         }
 
         @Override
         public void onActivityResult(int resultCode, Intent data) {
             JSONObject response = new JSONObject();
 
             try {
                 if (data != null) {
-                    response.put("extras", JSONUtils.bundleToJSON(data.getExtras()));
-                    response.put("uri", data.getData().toString());
+                    if (data.getExtras() != null) {
+                        response.put("extras", JSONUtils.bundleToJSON(data.getExtras()));
+                    } else {
+                        response.put("extras", null);
+                    }
+                    if (data.getData() != null) {
+                        response.put("uri", data.getData().toString());
+                    } else {
+                        response.put("uri", null);
+                    }
                 }
 
                 response.put("resultCode", resultCode);
             } catch (JSONException e) {
                 Log.w(LOGTAG, "Error building JSON response.", e);
             }
 
             EventDispatcher.sendResponse(message, response);