am 1f0f9fa9: Merge "Add null pointer check." into klp-dev

* commit '1f0f9fa94913198cd79b8d350cf9e8df8001daeb':
  Add null pointer check.