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

Two things to fix #1310 even harder