fix issues with route watches returning 404 and 500 errors

Fix issues with route watches returning 404 and 500 errors
Did David's upstream fix that exposes this as public make it into our rebase yet?