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

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