Stage DataWatcher & WatchableObject.

So that we may identify the exact cause of exceptions originating from these classes.