make watch actually return an error when there's an error

Two things to fix #1310 even harder
Yeah, I'm convinced--if you have a preference for this, I can make it happen. Can I do it in a subsequent PR, though? This one at least prevents a nasty errorloop.