diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
index 57444d0262..fe2e7c130d 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
@@ -284,6 +284,9 @@ public class PlayerActivity extends Activity
           extensions = new String[uriStrings.length];
         }
         manifestFilters = intent.getParcelableArrayExtra(MANIFEST_FILTER_LIST_EXTRA);
+        if (manifestFilters == null) {
+          manifestFilters = new Parcelable[uriStrings.length];
+        }
       } else {
         showToast(getString(R.string.unexpected_intent_action, action));
         return;