am 23ce0f14: am be622845: NPE fix

* commit '23ce0f148f20e11252c422bfaa461adecb2842a0':
  NPE fix