=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java	2014-03-18 13:40:38 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java	2014-03-18 13:52:12 +0000
@@ -330,7 +330,7 @@
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     public Boolean getOrgunitScope()
     {
-        return orgunitScope;
+        return orgunitScope != null ? orgunitScope : false;
     }
 
     public void setOrgunitScope( Boolean orgunitScope )
@@ -343,7 +343,7 @@
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     public Boolean getProgramScope()
     {
-        return programScope;
+        return programScope != null ? programScope : false;
     }
 
     public void setProgramScope( Boolean programScope )