Adding support for error handlers
Adding support for Goodbye messages