=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2016-02-12 16:51:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2016-02-12 17:14:15 +0000
@@ -234,7 +234,14 @@
      */
     public List<TrackedEntityAttribute> getTrackedEntityAttributes()
     {
-        return programAttributes.stream().map( p -> p.getAttribute() ).collect( Collectors.toList() );
+        List<TrackedEntityAttribute> attributes = new ArrayList<>();
+        
+        for ( ProgramTrackedEntityAttribute attribute : programAttributes )
+        {
+            attributes.add( attribute.getAttribute() );
+        }
+        
+        return attributes;
     }
 
     /**
@@ -243,7 +250,7 @@
      */
     public List<TrackedEntityAttribute> getNonConfidentialTrackedEntityAttributes()
     {
-        return programAttributes.stream().map( p -> p.getAttribute() ).filter( a -> !a.isConfidential() ).collect( Collectors.toList() );
+        return getTrackedEntityAttributes().stream().filter( a -> !a.isConfidential() ).collect( Collectors.toList() );
     }
 
     /**