Network errors are now handled properly