Added undefined check for this.watcher.