Send correct message when schema is not found
merge develop