Add error logging capability
House cleaning for handler
Add client failure logic