Better error handling with network issues