Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java,v
diff -u -r1.9 -r1.10
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java	11 May 2006 06:58:35 -0000	1.9
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java	30 May 2006 07:12:45 -0000	1.10
@@ -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();