Merge "Better logging for NPE" into jb-ub-mail-ur8