Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
===================================================================
diff -u -r2cdc9593bafb191bcc07439fe37d41d3cd718651 -r4d72f55fbac086d72edbf3b2975fc0bb2b464213
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	(.../LdapService.java)	(revision 2cdc9593bafb191bcc07439fe37d41d3cd718651)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java	(.../LdapService.java)	(revision 4d72f55fbac086d72edbf3b2975fc0bb2b464213)
@@ -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();