Don't double-close the channel when etcd returns an error.

Fail more nicely when etcd flakes in integration tests.