Check for NPE when creating Bundle

Bug: 28982151
Change-Id: I9f1798ba211de572a3e30a94fcf955984c89fa7d
1 file changed