Merge "Add null pointer checks to fix NPEs" into jb-dev