Watch handler not returning after 404