Change error messages, see issue 6544