am 3988dd5a: am a6eca19a: am f7806581: Avoid crashing

* commit '3988dd5a6baa2d061da605aebd6f54566f51bbfa':
  Avoid crashing