Minor update; better handling network connectivity failure