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

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