am 6938aef3: am eb19e766: Prevent crashes if a map cannot be created.

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