[RFC 0/3] Fix crash when network is lost