Improve error reporting messages
1 file changed