am a35a7807: Merge "Fix NPE" into jb-dev

* commit 'a35a7807c27641187e6de5dee8dcd405b683e294':
  Fix NPE