Fix Error handle and logs
3 files changed