am c298d29b: Merge "Add check for null pointer to avoid crash."

* commit 'c298d29b081e4240c80750e9431b7189d0b38513':
  Add check for null pointer to avoid crash.