diff --git a/src/main/java/org/olat/course/config/ui/CourseOptionsController.java b/src/main/java/org/olat/course/config/ui/CourseOptionsController.java
index 627a7cf223ff5895c96e0af588c821645db8f82a..0735c3cae6c2a1a93156638949f678b9f09c8eb2 100644
--- a/src/main/java/org/olat/course/config/ui/CourseOptionsController.java
+++ b/src/main/java/org/olat/course/config/ui/CourseOptionsController.java
@@ -372,7 +372,9 @@ public class CourseOptionsController extends FormBasicController {
 	
 	private void updateToolbar() {
 		boolean enabled = toolbarEl.isSelected(0);
-		calendarCont.setVisible(enabled);
+		if(calendarCont != null) {
+			calendarCont.setVisible(enabled);
+		}
 		chatCont.setVisible(enabled);
 		glossaryCont.setVisible(enabled);
 	}