Merge "protect against null" into jb-ub-mail