diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
index 802a952a5c9a6df5bd47838842bc596fa54c62bd..185782fcf6849677e54f9302c90f4e2ad41057f0 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_de.properties
@@ -411,4 +411,5 @@ warning.binder.synched=Die Portfolioaufgabe wurde mit ihrer Vorlage synchronisie
 warning.evaluation.not.visible.text=Zur Zeit ist die Einsch\u00E4tzung nicht sichtbar.
 warning.evaluation.not.visible.title=Einsch\u00E4tzung nicht sichtbar
 warning.portfolio.not.found=Die Portfolio Mappe konnte nicht gefunden werden. Sie wurde wahrscheinlich gel\u00F6scht.
+warning.page.not.found=Der Eintrag konnte nicht gefunden werden. Sie wurde wahrscheinlich gel\u00F6scht.
 warning.template.in.use=Die Vorlage konnte nicht gel\u00F6scht werden, weil sie von einigen Benutzern in Verwendung ist.
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
index 410a41eaf058c61a862363733e74a3897a1c9a0a..a754beef7c616c66dd8edd47f11e85470ef6eb20 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/portfolio/ui/_i18n/LocalStrings_en.properties
@@ -410,5 +410,6 @@ volume=Volume
 warning.binder.synched=The binder is synchronized with its template.
 warning.evaluation.not.visible.text=The evaluation is for the moment not visible.
 warning.evaluation.not.visible.title=Evaluation not visible
+warning.page.not.found=The entry cannot be found, probably deleted in the mean time
 warning.portfolio.not.found=The portfolio cannot be found, probably deleted in the mean time
 warning.template.in.use=The template cannot deleted because some users use it.
diff --git a/src/main/java/org/olat/modules/portfolio/ui/shared/SharedPagesController.java b/src/main/java/org/olat/modules/portfolio/ui/shared/SharedPagesController.java
index 469e29e2eeba2f80cefffbe043124c606afafba6..290d5a96fb381ca1455fb40e450c2592bd9ae21c 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/shared/SharedPagesController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/shared/SharedPagesController.java
@@ -340,6 +340,11 @@ public class SharedPagesController extends FormBasicController implements Activa
 		removeAsListenerAndDispose(pageCtrl);
 		
 		Page reloadedPage = portfolioService.getPageByKey(row.getPageKey());
+		if(reloadedPage == null) {
+			loadModel(true, true);
+			showWarning("warning.page.not.found");
+			return null;
+		}
 		Binder binder = reloadedPage.getSection().getBinder();
 		
 		OLATResourceable pageOres = OresHelper.createOLATResourceableInstance("Entry", reloadedPage.getKey());
diff --git a/src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties
index 82f509adee9cba5b2d2d26da864c51a6a9d8661c..4a1e40d8b25eb65170fedbfff54d20b69f81b2dc 100644
--- a/src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_de.properties
@@ -386,6 +386,7 @@ import.example.studySubject=Jura
 import.example.telMobile=0781234567
 import.example.telOffice=0449871234
 import.example.telPrivate=0443215467
+import.example.typeOfUser=Betreuer
 import.example.xingname=xingbenutzer oder E-Mail-Adresse
 import.example.zipCode=8000
 nocountry.doselect=-
diff --git a/src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_en.properties
index 0d2ad752cdea35509a4af2a3059c70bb6045951b..5ffd888aa4480e4c3701ef5c13924eeacfe77ac9 100644
--- a/src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/user/propertyhandlers/_i18n/LocalStrings_en.properties
@@ -386,6 +386,7 @@ import.example.studySubject=Law
 import.example.telMobile=0781234567
 import.example.telOffice=0449871234
 import.example.telPrivate=0443215467
+import.example.typeOfUser=Coach
 import.example.xingname=xing user or e-mail address
 import.example.zipCode=10000
 nocountry.doselect=-