Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -r20a7161d7a57d9571b9242f06a7efe561bb82a90 -re13e23fd405b029e75a3b1895f90cf4cfe9d30ef
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 20a7161d7a57d9571b9242f06a7efe561bb82a90)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision e13e23fd405b029e75a3b1895f90cf4cfe9d30ef)
@@ -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);
 		}