Add in the ability to get the client out of the error handler.