am 6ab5b21d: Merge "Temporarily handle a NPE" into jb-ub-mail-ur10

* commit '6ab5b21d3dec96d76c9d6fe6bbc600419c60cfd8':
  Temporarily handle a NPE