am e7f817ec: am 11d78d46: am 3f7e06ae: Merge "Prevent crashes if a map cannot be created."

* commit 'e7f817ec0b19ce754917838eb56c0b2cc7dec747':
  Prevent crashes if a map cannot be created.