Merge "Fixed the NullPointerException" into klp-dev