diff --git a/src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java b/src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java
index 207b639d8f78ea71d479ffdb5c28371514d7d8d2..b639862acf951e2d59b073161c8a14c888336a6a 100644
--- a/src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java
+++ b/src/main/java/org/olat/core/commons/modules/singlepage/SinglePageController.java
@@ -346,7 +346,7 @@ public class SinglePageController extends BasicController implements CloneableCo
 	public void event(UserRequest ureq, Component source, Event event) {
 		if (source == editLink) {
 			if (event.getCommand().equals(COMMAND_EDIT)) {
-				if (g_curURI == null || g_new_rootContainer.resolve(g_curURI) == null) {
+				if (g_curURI == null || g_new_rootContainer == null || g_new_rootContainer.resolve(g_curURI) == null) {
 					showError("error.pagenotfound");
 					return;
 				}