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