Revert changes on clock watch error handling mechanism.

watch error should be handled by the clock instance.
this way if an error happens on a clock instance which is not displayed anymore,
the current scope is unaffected, and the error message doesn't show on screen.