am 18f69b02: Merge "Fix NPE" into jb-mr1-dev

* commit '18f69b02ef814bf0b7f3607d9e34096d104c2173':
  Fix NPE