Merge "Add null pointer check to avoid system crash."