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

* commit 'b291365172b85c3037fa10fe27060a44f4b44162':
  Revert "Prevent an NPE"