Merge "Avoid NPE until we understand better." into jb-dev