am 9b5fb846: Merge "Prevent NPE" into jb-ub-mail-ur10

* commit '9b5fb8460331d454750819fb927c17da5fa85503':
  Prevent NPE