diff --git a/src/main/java/org/olat/course/editor/EditorMainController.java b/src/main/java/org/olat/course/editor/EditorMainController.java
index 5265c5d8817f1607d7a2307a37efe26843738824..3d9e4318e8a1e3eeb56d1f0d7706183c0552bef5 100644
--- a/src/main/java/org/olat/course/editor/EditorMainController.java
+++ b/src/main/java/org/olat/course/editor/EditorMainController.java
@@ -1178,6 +1178,9 @@ public class EditorMainController extends MainLayoutBasicController implements G
 	}
 	
 	public boolean hasPublishableChanges(ICourse course) {
+		if(cetm == null || course == null) {
+			return false;
+		}
 		PublishProcess publishProcess = PublishProcess.getInstance(course, cetm, getLocale());
 		PublishTreeModel publishTreeModel = publishProcess.getPublishTreeModel();
 		return publishTreeModel.hasPublishableChanges();