Further improving the error messages