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

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