Merge "Add null pointer check." into klp-dev