am e171593f: am 6de95261: Merge "Add a missing NULL check." into jb-mr1-dev

* commit 'e171593f9afb2b345257cc8e6599f8da9b3437c3':
  Add a missing NULL check.