Check for NPE when creating Bundle
am: 5fd3f2e7a1

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

Change-Id: I81aa4f75212b0032971cbfb4f092ea4ea3a28e8e