am f024e7ac: Merge "Fix possible NPE" into jb-mr2-dev

* commit 'f024e7ac44e00ea560f547b4e5d67645a2e6c9b4':
  Fix possible NPE