Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.73 -r1.74 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 14 Dec 2006 23:43:47 -0000 1.73 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 6 Feb 2007 23:28:12 -0000 1.74 @@ -656,7 +656,10 @@ uo = new UserOrganisation(user, org); save(uo); log.debug("added "+user.getLogin()+" to "+org.getName()); - Set uos = org.getUserOrganisations(); + Set uos; + if ((uos=org.getUserOrganisations())==null) { + uos = new HashSet(); + } uos.add(uo); }