here we're still checking for env map to be null, which is not possible any more, right (since you initialize it as empty map)?