Changed how we handle connection failures... for now