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

* commit '6de95261c619d53f3e7b431fd17995e73928571e':
  Add a missing NULL check.