Improved: error messages