Added additional checks to the watch tree.