Merge "Fix NPE" into jb-dev