Merge "Better handle null members" into jb-ub-mail-ur8