Check for non-None watcher before stopping