MDL-39260 Improve a bit the non-matching message