am 69314e72: Fix NPE.

* commit '69314e72941c86734c12476d1e61459811159b74':
  Fix NPE.