Mappers: Better validation of mapping JSON

Closes #7205