fixing map to allow null locations