Disconnecting on socket error without retry, populating @not_sure_if_sent immediately
Couple bug fixes