am 1d80cb23: Merge "Fix a NPE"

* commit '1d80cb230180305a173add2fe30b14cefc597126':
  Fix a NPE