Properly raise on matching on map keys