Fixs error message issue