=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitHierarchy.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitHierarchy.java	2012-04-24 12:14:22 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitHierarchy.java	2012-04-25 08:51:17 +0000
@@ -69,6 +69,11 @@
     {
         for ( OrganisationUnitRelationship relation : relations )
         {
+            if ( relation.getParentId() == relation.getChildId() )
+            {
+                continue; // Parent cannot be same as child
+            }
+            
             Set<Integer> children = relationships.get( relation.getParentId() );
             
             if ( children == null )