am 0b327101: Merge "Fix possible NPE"

* commit '0b3271010fe6e438d57a5d4504e021e001bb9f5e':
  Fix possible NPE