Add client monitoring command
Move error handler to context