=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/AttributeUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/AttributeUtils.java	2015-11-20 05:42:56 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/AttributeUtils.java	2015-11-23 02:31:01 +0000
@@ -88,15 +88,15 @@
                     else
                     {
                         attributeValueItem.setValue( attributeValue.getValue() );
+
                         try
                         {
                             attributeService.updateAttributeValue( object, attributeValueItem );
+                            attributeValue = null;
                         }
                         catch ( NonUniqueAttributeValueException ignored ) // ignore for now
                         {
                         }
-
-                        attributeValue = null;
                     }
                 }
             }