diff --git a/src/main/java/org/olat/portfolio/manager/EPPolicyManager.java b/src/main/java/org/olat/portfolio/manager/EPPolicyManager.java
index e8fb11890577407c73ee6630545702edd59ddaee..61d160033d3df55ae53d835dc7805a7ec45fa09a 100644
--- a/src/main/java/org/olat/portfolio/manager/EPPolicyManager.java
+++ b/src/main/java/org/olat/portfolio/manager/EPPolicyManager.java
@@ -288,7 +288,7 @@ public class EPPolicyManager {
 	private EPStructureElementToGroupRelation applyPolicyToGroup(Group group, EPMapPolicy policy, PortfolioStructureMap map) {
 		Collection<EPStructureElementToGroupRelation> currentRelations = map.getGroups();
 		for(EPStructureElementToGroupRelation currentRelation:currentRelations) {
-			if(currentRelation.getGroup().equals(group)) {
+			if(currentRelation.getGroup() != null && currentRelation.getGroup().equals(group)) {
 				updatePolicy(currentRelation, policy.getFrom(), policy.getTo());
 				return currentRelation;
 			}
diff --git a/src/main/java/org/olat/portfolio/manager/InvitationDAO.java b/src/main/java/org/olat/portfolio/manager/InvitationDAO.java
index e802be56af7ba69f48b539bd4cd7e5bf49365d13..6e9e1fb8259909982774cd0e4aa38ada0f47cff4 100644
--- a/src/main/java/org/olat/portfolio/manager/InvitationDAO.java
+++ b/src/main/java/org/olat/portfolio/manager/InvitationDAO.java
@@ -131,7 +131,8 @@ public class InvitationDAO {
 	public Invitation findInvitation(Group group) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("select invitation from binvitation as invitation ")
-		  .append(" where invitation.baseGroup=:group");
+		  .append(" inner join fetch invitation.baseGroup bGroup")
+		  .append(" where bGroup=:group");
 
 		List<Invitation> invitations = dbInstance.getCurrentEntityManager()
 				  .createQuery(sb.toString(), Invitation.class)
@@ -149,6 +150,7 @@ public class InvitationDAO {
 	public Invitation findInvitation(String token) {
 		StringBuilder sb = new StringBuilder();
 		sb.append("select invitation from binvitation as invitation ")
+		  .append(" inner join fetch invitation.baseGroup bGroup")
 		  .append(" where invitation.token=:token");
 
 		List<Invitation> invitations = dbInstance.getCurrentEntityManager()
diff --git a/src/main/java/org/olat/portfolio/ui/structel/EPMultipleMapController.java b/src/main/java/org/olat/portfolio/ui/structel/EPMultipleMapController.java
index 7b70ec0bbb71ace8e6a9eab66ea3806a1016d871..86a999c3418b3e363de42c203316ea8309d944b2 100644
--- a/src/main/java/org/olat/portfolio/ui/structel/EPMultipleMapController.java
+++ b/src/main/java/org/olat/portfolio/ui/structel/EPMultipleMapController.java
@@ -280,7 +280,7 @@ public class EPMultipleMapController extends BasicController implements Activate
 					EPTargetResource resource = structMap.getTargetResource();
 					RepositoryEntry repoEntry = RepositoryManager.getInstance().lookupRepositoryEntry(resource.getOLATResourceable(), false);
 					if(repoEntry != null) {
-						vC.contextPut("courseName" + i, repoEntry.getDisplayname());
+						vC.contextPut("courseName" + i, StringHelper.escapeHtml(repoEntry.getDisplayname()));
 						String url = Settings.getServerContextPathURI();
 						url += "/url/RepositoryEntry/" + repoEntry.getKey() + "/CourseNode/" + resource.getSubPath();
 						vC.contextPut("courseLink" + i, url);
diff --git a/src/test/java/org/olat/portfolio/manager/InvitationDAOTest.java b/src/test/java/org/olat/portfolio/manager/InvitationDAOTest.java
index c53a6a404d8811b269a5d6f66a3adb3d76fc8492..0d693a13885f99c44c7eed108d22055cc7bcf577 100644
--- a/src/test/java/org/olat/portfolio/manager/InvitationDAOTest.java
+++ b/src/test/java/org/olat/portfolio/manager/InvitationDAOTest.java
@@ -26,6 +26,7 @@ import java.util.UUID;
 
 import org.junit.Assert;
 import org.junit.Test;
+import org.olat.basesecurity.Group;
 import org.olat.basesecurity.Invitation;
 import org.olat.core.commons.persistence.DB;
 import org.olat.core.id.Identity;
@@ -64,6 +65,21 @@ public class InvitationDAOTest extends OlatTestCase {
 		Assert.assertNotNull(invitation.getToken());
 	}
 	
+	@Test
+	public void findInvitation_group() {
+		Invitation invitation = invitationDao.createAndPersistInvitation();
+		Group baseGroup = invitation.getBaseGroup();
+		Assert.assertNotNull(invitation);
+		dbInstance.commitAndCloseSession();
+		
+		Invitation reloadedInvitation = invitationDao.findInvitation(baseGroup);
+		Assert.assertNotNull(reloadedInvitation);
+		Assert.assertNotNull(reloadedInvitation.getKey());
+		Assert.assertEquals(baseGroup, reloadedInvitation.getBaseGroup());
+		Assert.assertEquals(invitation, reloadedInvitation);
+		Assert.assertEquals(invitation.getToken(), reloadedInvitation.getToken());
+	}
+	
 	@Test
 	public void findInvitation_token() {
 		Invitation invitation = invitationDao.createAndPersistInvitation();
@@ -78,6 +94,7 @@ public class InvitationDAOTest extends OlatTestCase {
 		Assert.assertEquals(invitation.getToken(), reloadedInvitation.getToken());
 	}
 	
+	
 	@Test
 	public void hasInvitationPolicies_testHQL() {
 		String token = UUID.randomUUID().toString();