Fixed user-facing error messages