Fixed bug when adding watcher to an empty database