Merge "Revert "Revert "Prevent an NPE""" into jb-ub-mail-ur10