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

* commit 'bcf26aae26145a2f2c818c78bc53dab70fcedd7d':
  Better handle null members