Fixed reporting of cases where there's no match for mandatory map call