FIX: #65 Handle network outages and issues