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

* commit '29bbd570fe36c55321a3cd9d84330dea9d2f1e10':
  Add null pointer check.