am 1df1f18d: Fix NPE.

* commit '1df1f18de496764a0c922053e601d1b6d6d3f31c':
  Fix NPE.