Merge "Add missing null check" into jb-dev