=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java	2012-06-06 16:37:56 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java	2012-06-14 10:37:38 +0000
@@ -73,6 +73,7 @@
         WebOptions options = new WebOptions( parameters );
         WebMetaData metaData = new WebMetaData();
         List<T> entityList = getEntityList( metaData, options );
+        System.err.println("EntityList.size: " + entityList.size());
 
         ReflectionUtils.invokeSetterMethod( ExchangeClasses.getExportMap().get( getEntityClass() ), metaData, entityList );
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2012-06-06 14:32:25 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2012-06-14 10:37:38 +0000
@@ -136,7 +136,14 @@
 
                     for ( IdentifiableObject object : objects )
                     {
-                        object.setLink( getPathWithUid( object ) );
+                        if ( object != null )
+                        {
+                            object.setLink( getPathWithUid( object ) );
+                        }
+                        else
+                        {
+                            System.err.println( "Object is null.. fixme!" );
+                        }
                     }
                 }
             }