am b3389cd6: fix NPE

* commit 'b3389cd6686f59e6e09978c912822a98681dac72':
  fix NPE