Merge "Add nullness check." into jb-mr2-dev