LPS-45051 Ensure that we don't have a map which is null