=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeService.java 2016-02-27 06:45:30 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeService.java 2016-03-02 11:54:40 +0000 @@ -307,7 +307,7 @@ } else if ( trackedEntityAttribute.hasOptionSet() && !trackedEntityAttribute.isValidOptionValue( value ) ) { - return "Value '" + errorValue + "'is not a valid option for attribute " + + return "Value '" + errorValue + "' is not a valid option for attribute " + trackedEntityAttribute.getUid() + " and option set " + trackedEntityAttribute.getOptionSet().getUid(); }