Modified the error messages