Connection: add guard for conditional