Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java,v
diff -u -r1.3.2.6 -r1.3.2.7
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	25 Sep 2007 07:20:46 -0000	1.3.2.6
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	26 Sep 2007 00:16:41 -0000	1.3.2.7
@@ -26,6 +26,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
@@ -253,6 +254,11 @@
 				// if the user is a member of any other groups, remove them
 				if (Configuration.getAsBoolean(ConfigurationKeys.LDAP_ONLY_ONE_ORG)) {
 					Set uos = user.getUserOrganisations();
+					// safety net in case hibernate hasn't initialised this set yet
+					if (uos == null) {
+						uos = new HashSet();
+						user.setUserOrganisations(uos);
+					}
 					Iterator i = uos.iterator();
 					while (i.hasNext()) {
 						UserOrganisation uo = (UserOrganisation)i.next();