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

* commit 'd74389d9027a128da85be151670ee43e55feaba5':
  Add null pointer checks to fix NPEs