Added error handler, updated client adding..