Adjusted to error messages