removed unnecessary throws declerations
fixed error handling if etcd goes down during watch