Merge "Add null check" into jb-dev