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

* commit '48b66727485a789489568ad4fe0392c8d3f8e52d':
  Add null check