am da9f1556: am cc14c8c4: Prevent a null pointer exception.

Merge commit 'da9f155662e8ea94bdda16e33b660769669148a7'

* commit 'da9f155662e8ea94bdda16e33b660769669148a7':
  Prevent a null pointer exception.