Improve exception handling in --watch mode.

Closes #12.