Fixed Bug: If unit of work fails, subsequent messages will not send