foo.diff

diff --git a/main.go b/main.go
index 7970001..0bdf8e5 100644
--- a/main.go
+++ b/main.go
@@ -42,9 +42,8 @@ func saWatch(s *service.WatchEntry) {
 
 	// TODO(rushba): add GetServiceByPrefix to Service interface ?
 	lakafka := services.GetServiceById(sa.SaServiceT_LAKAFKA)
-	err := lakafka.UpdateServicesMap(s)
 
-	if err != nil {
+	if err := lakafka.UpdateServicesMap(s); err != nil {
 		log.Errorf("lakafka.UpdateServicesMap() failed: %s", err)
 	}
 
diff --git a/services/lakafka/config_manager.go b/services/lakafka/config_manager.go
index c59f1aa..def498c 100644
--- a/services/lakafka/config_manager.go
+++ b/services/lakafka/config_manager.go
@@ -175,12 +175,12 @@ func delLakafka(dcName string, lc *lakafkaConfig) error {
 	dc, ok := manager.datacenters[dcName]
 	if !ok {
 		// TODO: special error type?
-		return fmt.Errorf("no such dc %s", dcName)
+		return fmt.Errorf("del lakafka failed: we don't have dc %s", dcName)
 	}
 
 	oldLc, ok := dc.lakafkaByID[lc.lakafkaID]
 	if !ok {
-		return fmt.Errorf("no such server %s in dc %s", lc.lakafkaID, dcName)
+		return fmt.Errorf("del lakafka failed: we don't know about server %s in dc %s", lc.lakafkaID, dcName)
 	}
 
 	// check we delete only the same server with same Address, same Partitions, etc