Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -r6ee8890aaed97ca62cfe38c2a4b1930855bca394 -r6c4022a99549f63f088ce13e0e201492a39c30da
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 6ee8890aaed97ca62cfe38c2a4b1930855bca394)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 6c4022a99549f63f088ce13e0e201492a39c30da)
@@ -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())