Add failOnError option to play nice with watch