Workaround etcd Watch timeout bug

I think this should be an `else if`.  It the first if triggers err is going to be set to `nil` and will be doing a type assertion on nil.   That may work, but feels awkward.