make sure self is defined in configureWatch
Merge remote-tracking branch 'origin/watch-crash'