am 2e9cef06: fix NPE

* commit '2e9cef068501643d82bb4eca20aedaea79ccc600':
  fix NPE