am 48ad5213: Fix NPE.

* commit '48ad5213e18a67b3a7ec3375214e3900240b889c':
  Fix NPE.