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

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