Untested better network loss handling

Signed-off-by: Andrei Thorp <athorp@evernote.com>