am 840ebf62: Merge "Fix NPE" into jb-dev

* commit '840ebf6277c8eea38b6a4f03cd8bb4e09bd69c7d':
  Fix NPE