Added checks for routes and service names. Fixes #2