am 76eed4ec: am 8aea7b4d: Merge "Fixed the NullPointerException" into klp-dev

* commit '76eed4ecd498c7f9f21dab0df1f51fbf23ffa35c':
  Fixed the NullPointerException