minor- check for not null of qualifier before adding to the map.