Fixed map loading NPEs