better handling of etcd not avilable