diff --git a/src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java b/src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java
index d825d3aac859198133e2212215069ef5840fdc38..5fd282e9d44ddda046d6c103d06c9f54ea61314c 100644
--- a/src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java
+++ b/src/main/java/org/olat/core/commons/editor/fileeditor/FileEditorController.java
@@ -142,7 +142,9 @@ public class FileEditorController extends BasicController implements Activateabl
 	@Override
 	public void event(UserRequest ureq, Component source, Event event) {
 		if(event == Window.CLOSE_WINDOW) {
-			editCtrl.dispatchEvent(ureq, source, event);
+			if(editCtrl != null) {
+				editCtrl.dispatchEvent(ureq, source, event);
+			}
 			doUnlock();
 		}
 	}