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

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