Make the watcher a bit more robust.