Watch handler not returning after 404
Merge pull request #840 from smarterclayton/missing_return_in_watch

Watch handler not returning after 404