Updated error messages for consistency