improve ErrorMessage and Usage