[MODIFY] error handling get better