Added connection error fallback