added check if service exists - #407