change: made it safe when there isn't a map to build