Fix watch task
Enhance some assertions and error henaling