=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/exception/NonUniqueAttributeValueException.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/exception/NonUniqueAttributeValueException.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/exception/NonUniqueAttributeValueException.java	2016-01-12 10:20:27 +0000
@@ -33,7 +33,7 @@
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
  */
-public class NonUniqueAttributeValueException extends Exception
+public class NonUniqueAttributeValueException extends RuntimeException
 {
     public NonUniqueAttributeValueException( AttributeValue attributeValue )
     {

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java	2016-01-12 10:20:27 +0000
@@ -33,7 +33,6 @@
 import org.hisp.dhis.attribute.Attribute;
 import org.hisp.dhis.attribute.AttributeService;
 import org.hisp.dhis.attribute.AttributeValue;
-import org.hisp.dhis.attribute.exception.NonUniqueAttributeValueException;
 import org.hisp.dhis.common.IdSchemes;
 import org.hisp.dhis.common.IdentifiableObject;
 import org.hisp.dhis.common.IdentifiableObjectManager;
@@ -144,14 +143,7 @@
     private AttributeValue addAttributeValue( IdentifiableObject identifiableObject, Attribute attribute, String value )
     {
         AttributeValue attributeValue = new AttributeValue( value, attribute );
-
-        try
-        {
-            attributeService.addAttributeValue( identifiableObject, attributeValue );
-        }
-        catch ( NonUniqueAttributeValueException ignored )
-        {
-        }
+        attributeService.addAttributeValue( identifiableObject, attributeValue );
 
         return attributeValue;
     }