No need to wait before reconnecting on empty resp
refactor watcher