Check for NPE when creating Bundle
am: 5fd3f2e7a1

* commit '5fd3f2e7a1e140e4244aae820daee8a509165b71':
  Check for NPE when creating Bundle

Change-Id: I803384ad54aee977ad4ed078cf42d9b058750b71