diff --git a/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java b/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
index d31de3a1e8324701595282788ffd61795bef0eaf..1d12fd848dcb035d9967384130b9aac09f162bd0 100644
--- a/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
+++ b/src/main/java/org/olat/core/commons/services/mark/ui/BookmarksPortletRunController.java
@@ -166,7 +166,9 @@ public class BookmarksPortletRunController extends AbstractPortletRunController<
 
 		for(Mark mark:items) {
 			RepositoryEntry repositoryEntry = keyToRepositoryEntryMap.get(mark.getOLATResourceable().getResourceableId());
-			convertedList.add(new Bookmark(mark, repositoryEntry));
+			if(repositoryEntry != null) {
+				convertedList.add(new Bookmark(mark, repositoryEntry));
+			}
 		}
 		return convertedList;
 	}
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 8784d6ad2ef94168a0377bae474f9d5c9977fee4..6c55dc0e7acd84dc3df299b375071e01dcd73597 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -783,7 +783,7 @@ ldap.attrib.sync.once.olatkey3=
 # Build properties
 #####
 application.name=OpenOLAT
-build.version=8.4.0b
+build.version=8.4.0
 build.identifier=openolat840-dev
 build.repo.revision=local-devel