am 8f546a76: Merge "Prevent NPE" into jb-ub-mail-ur9

* commit '8f546a76fbea12b7d2a902ecfe64ab7f7d8c19ea':
  Prevent NPE