Merge "Fix NPE for real" into jb-dev