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

* commit '8aea7b4d3d79163912f55a2d37657c4d33109655':
  Fixed the NullPointerException