=== 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 2013-10-01 13:32:53 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java 2013-10-15 10:43:45 +0000 @@ -130,6 +130,11 @@ @SuppressWarnings("unchecked") public static void generateLinks( Object object, boolean deep ) { + if ( object == null ) + { + return; + } + if ( IdentifiableObject.class.isAssignableFrom( object.getClass() ) ) { IdentifiableObject identifiableObject = (IdentifiableObject) object;