Improved error messages clarity