add a check for services before selecting an endpoint (#1634)

add a check for services before selecting an endpoint (#1634) #475