Merge "Add a missing NULL check." into jb-mr1-dev