=== 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	2015-10-19 14:51:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeService.java	2015-10-22 02:38:41 +0000
@@ -205,7 +205,7 @@
     {
         Assert.notNull( trackedEntityAttribute, "trackedEntityAttribute is required." );
 
-        if ( !trackedEntityAttribute.isUnique() )
+        if ( !trackedEntityAttribute.isUnique() || value == null )
         {
             return null;
         }