diff --git a/Parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java b/Parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java
index 4b1dc5295..23a38781e 100644
--- a/Parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java
+++ b/Parse/src/main/java/com/parse/ParsePushBroadcastReceiver.java
@@ -136,9 +136,15 @@ public void onReceive(Context context, Intent intent) {
    *      An {@code Intent} containing the channel and data of the current push notification.
    */
   protected void onPushReceive(Context context, Intent intent) {
+    String pushDataStr = intent.getStringExtra(KEY_PUSH_DATA);
+    if (pushDataStr == null) {
+      PLog.e(TAG, "Can not get push data from intent.");
+      return;
+    }
+
     JSONObject pushData = null;
     try {
-      pushData = new JSONObject(intent.getStringExtra(KEY_PUSH_DATA));
+      pushData = new JSONObject(pushDataStr);
     } catch (JSONException e) {
       PLog.e(TAG, "Unexpected JSONException when receiving push data: ", e);
     }