am ed19512a: Merge "Add null check" into jb-dev

* commit 'ed19512a329e66afaf48c8346b823e5fcc73bd02':
  Add null check