Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v
diff -u -r1.41 -r1.42
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	24 Nov 2006 02:09:34 -0000	1.41
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	24 Nov 2006 02:15:22 -0000	1.42
@@ -159,6 +159,7 @@
 	private UserOrgRoleDTO getGlobalRoles(User user) {
 		UserOrganisation uo = service.getUserOrganisation(user.getUserId(),
 				service.getRootOrganisation().getOrganisationId());
+		if (uo==null) return null;
 		UserOrgRoleDTO uorDTO = new UserOrgRoleDTO();
 		List<String> roles = new ArrayList<String>();
 		for (Object uor : uo.getUserOrganisationRoles())