Be better about losing network connectivity

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