Now removing watches that don't exist won't crash the dispatcher.