add some error handling
re-wire websocket push