am a6eca19a: am f7806581: Avoid crashing

* commit 'a6eca19ad15eb75588635f89dec1093c9eecffdf':
  Avoid crashing