am e283effc: am 165e51a7: Temporary patch to avoid crashes.

* commit 'e283effcba208233e14916d56e417fe7dbe953ca':
  Temporary patch to avoid crashes.