prevent double-closing of in-flight watchers

Signed-off-by: Phan Le <ple@pivotallabs.com>