Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r197b20b70e857ae38790ebde37e29214a2a2c46e -r289fb356abfcf0f7993661b8dae2046272878294
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 197b20b70e857ae38790ebde37e29214a2a2c46e)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 289fb356abfcf0f7993661b8dae2046272878294)
@@ -332,17 +332,20 @@
 			
 		Organisation organisation = (Organisation)baseDAO.find(Organisation.class,organisationID);
 		if (organisation != null) {
-			Iterator iterator = organisation.getUserOrganisations().iterator();
-			while (iterator.hasNext()) {
-				UserOrganisation userOrganisation = (UserOrganisation) iterator.next();
-				Iterator userOrganisationRoleIterator = userOrganisation.getUserOrganisationRoles().iterator();
-				while (userOrganisationRoleIterator.hasNext()) {
-					UserOrganisationRole userOrganisationRole = (UserOrganisationRole) userOrganisationRoleIterator.next();
-					if (userOrganisationRole.getRole().getName().equals(roleName))
-						if(isFlashCall)
-							users.add(userOrganisation.getUser().getUserFlashDTO());
-						else 
-							users.add(userOrganisation.getUser().getUserDTO());
+			Set uos = organisation.getUserOrganisations();
+			if (uos != null) {
+				Iterator iterator = uos.iterator();
+				while (iterator.hasNext()) {
+					UserOrganisation userOrganisation = (UserOrganisation) iterator.next();
+					Iterator userOrganisationRoleIterator = userOrganisation.getUserOrganisationRoles().iterator();
+					while (userOrganisationRoleIterator.hasNext()) {
+						UserOrganisationRole userOrganisationRole = (UserOrganisationRole) userOrganisationRoleIterator.next();
+						if (userOrganisationRole.getRole().getName().equals(roleName))
+							if(isFlashCall)
+								users.add(userOrganisation.getUser().getUserFlashDTO());
+							else 
+								users.add(userOrganisation.getUser().getUserDTO());
+					}
 				}
 			}
 		}
@@ -482,6 +485,7 @@
                     		Organisation pOrg = organisation.getParentOrganisation();
                     		// set parent's child orgs
                     		Set children = pOrg.getChildOrganisations();
+                    		if (children==null) children = new HashSet();
                     		children.add(organisation);
                     		pOrg.setChildOrganisations(children);
                     		// get course managers and give them staff role in this new class