Connection failure is now handled better