Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -rbc88440466e346d72e641402295f0acfffdd0cb8 -r5b4945ea67039e707ec71419a020c4a599356384
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision bc88440466e346d72e641402295f0acfffdd0cb8)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 5b4945ea67039e707ec71419a020c4a599356384)
@@ -382,7 +382,8 @@
 		Map<String,Object> properties = new HashMap<String,Object>();
 		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) {