Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.49 -r1.50 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 23 Aug 2006 02:03:23 -0000 1.49 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 29 Aug 2006 04:34:45 -0000 1.50 @@ -382,7 +382,8 @@ Map properties = new HashMap(); properties.put("user.userId",userId); properties.put("organisation.organisationId",orgId); - return (UserOrganisation)baseDAO.findByProperties(UserOrganisation.class,properties).get(0); + List results = baseDAO.findByProperties(UserOrganisation.class,properties); + return results.isEmpty() ? null : (UserOrganisation)results.get(0); } private User createWorkspaceForUser(User user) {