diff --git a/cmd/control/service.go b/cmd/control/service.go
index 2f48f057..cc023764 100644
--- a/cmd/control/service.go
+++ b/cmd/control/service.go
@@ -95,7 +95,7 @@ func disable(c *cli.Context) {
 
 	for _, service := range c.Args() {
 		if _, ok := cfg.Rancher.ServicesInclude[service]; !ok {
-			continue
+			logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service)
 		}
 
 		cfg.Rancher.ServicesInclude[service] = false
@@ -118,7 +118,7 @@ func del(c *cli.Context) {
 
 	for _, service := range c.Args() {
 		if _, ok := cfg.Rancher.ServicesInclude[service]; !ok {
-			continue
+			logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service)
 		}
 		delete(cfg.Rancher.ServicesInclude, service)
 		changed = true
@@ -137,6 +137,11 @@ func enable(c *cli.Context) {
 		logrus.Fatal(err)
 	}
 
+	services, err := util.GetServices(cfg.Rancher.Repositories.ToArray())
+	if err != nil {
+		logrus.Fatalf("Failed to get services: %v", err)
+	}
+
 	var enabledServices []string
 
 	for _, service := range c.Args() {
@@ -145,6 +150,10 @@ func enable(c *cli.Context) {
 				logrus.Fatalf("ERROR: Service should be in path /var/lib/rancher/conf")
 			}
 
+			if !util.Contains(services, service) {
+				logrus.Fatalf("ERROR: Service %s is not a valid service, use \"sudo ros service list\" to list the services", service)
+			}
+
 			cfg.Rancher.ServicesInclude[service] = true
 			enabledServices = append(enabledServices, service)
 		}