Make sure watcher is stopped before indexing