Ran into this while replying, got stuck. Perhaps we need some kind of timeout if there's a network connectivity issue?