US #71: Watchers
Smallfix: Catch some exceptions