=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/legend/DefaultLegendService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/legend/DefaultLegendService.java	2015-02-24 13:16:58 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/legend/DefaultLegendService.java	2015-02-24 20:43:31 +0000
@@ -3,10 +3,12 @@
 import java.util.List;
 
 import org.hisp.dhis.common.GenericIdentifiableObjectStore;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author Lars Helge Overland
  */
+@Transactional
 public class DefaultLegendService
     implements LegendService
 {

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java	2015-02-24 13:16:58 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java	2015-02-24 20:43:31 +0000
@@ -73,7 +73,7 @@
 
         legendService.addLegendSet( legendSet );
 
-        ContextUtils.createdResponse( response, "Map legend set created", LegendSetSchemaDescriptor.API_ENDPOINT + "/" + legendSet.getUid() );
+        ContextUtils.createdResponse( response, "Legend set created", LegendSetSchemaDescriptor.API_ENDPOINT + "/" + legendSet.getUid() );
     }
 
     @Override
@@ -85,7 +85,7 @@
 
         if ( legendSet == null )
         {
-            ContextUtils.notFoundResponse( response, "Map legend set does not exist: " + uid );
+            ContextUtils.notFoundResponse( response, "Legend set does not exist: " + uid );
             return;
         }
 
@@ -119,7 +119,7 @@
 
         if ( legendSet == null )
         {
-            ContextUtils.notFoundResponse( response, "Map legend set does not exist: " + uid );
+            ContextUtils.notFoundResponse( response, "Legend set does not exist: " + uid );
             return;
         }