am 2561ee84: am d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-dev

* commit '2561ee8453dc41a9d65f7890ea227416d7e8948c':
  Add null pointer checks to fix NPEs