am b07f6e09: Merge "Fix NPE."

* commit 'b07f6e09eac568b1a0f2dd460034971e6e6323ff':
  Fix NPE.