diff --git a/src/main/java/org/olat/catalog/ui/CatalogController.java b/src/main/java/org/olat/catalog/ui/CatalogController.java
index 3118c4224332d1a01d2013bfcadb34ca033c7b01..918e15776687b812a1a97ef33cc139a4de62e52a 100644
--- a/src/main/java/org/olat/catalog/ui/CatalogController.java
+++ b/src/main/java/org/olat/catalog/ui/CatalogController.java
@@ -1197,6 +1197,7 @@ public class CatalogController extends BasicController implements Activateable2
 		Long catId = catCe.getOLATResourceable().getResourceableId();
 		if(catId == null || catId.longValue() == 0l) return;//nothing to do
 		CatalogEntry ce = CatalogManager.getInstance().loadCatalogEntry(catId);
+		if(ce == null) return;//catalog entry not found, do nothing
 		switch(ce.getType()) {
 			case CatalogEntry.TYPE_NODE: {
 				reloadHistoryStack(ureq, catId);