Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r453657273826fb520de121b889e06d3573fd5c4a --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java (.../OrganisationDTO.java) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java (.../OrganisationDTO.java) (revision 453657273826fb520de121b889e06d3573fd5c4a) @@ -62,7 +62,7 @@ } public OrganisationDTO(Organisation organisation){ this.organisationID = organisation.getOrganisationId(); - this.parentID = organisation.getParentOrganisation().getOrganisationId(); + this.parentID = (organisation.getParentOrganisation() == null)? new Integer(-1):organisation.getParentOrganisation().getOrganisationId(); this.name = organisation.getName(); this.description = organisation.getDescription(); this.organisationTypeId = organisation.getOrganisationType().getOrganisationTypeId();