diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
index 4fe2ef0e164948363ad6656dc6c01c0f03cd6fd7..bbcc3faa1d58ac064ccf5bfebec58232dec6c446 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/AssessmentTestComposerController.java
@@ -1201,6 +1201,11 @@ public class AssessmentTestComposerController extends MainLayoutBasicController
 		if(confirmDeleteCtrl != null) return;
 		
 		TreeNode selectedNode = menuTree.getSelectedNode();
+		if(selectedNode == null) {
+			showWarning("warning.atleastone");
+			return;
+		}
+		
 		Object uobject = selectedNode.getUserObject();
 		if(uobject instanceof AssessmentTest) {
 			showWarning("error.cannot.delete");
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
index 23f3cead82cfb54be5c7acdab28ee67a44c17f76..2d0bb2849a11457d7f36be4f4e885ce3eec3ef33 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
@@ -157,6 +157,7 @@ tools.reload.from.files=Dateien neu laden und im Puffer ersetzen
 tools.reload.from.files.tooltip=Only visible to administrators.
 warning.alien.assessment.item=Dieser Fragetyp kann nicht mit dem OpenOLAT-Editor bearbeitet werden.
 warning.alien.assessment.test=Dieser Test kann nicht mit dem OpenOLAT-Editor bearbeitet werden.
+warning.atleastone=Bitte w\u00E4hlen Sie mindestens ein Element.
 warning.atleastonesection=Diese Sektion kann nicht gel\u00F6scht werden. Ein Test oder ein Test-Part muss mindestens eine Sektion enthalten.
 warning.feedback.cutvalue=Feedback wird aktiviert sobald bei "Notwendige Punktzahl f\u00FCr 'Bestanden'" eine Punktzahl eingegeben wurde.
 warning.in.use=Die Ressource wird bereits f\u00FCr Auswertung verwendet. Die Bearbeitung ist begrenzt.
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
index 5ccf6cf0d4d76e549af294b960c8c60bbb9aa7c9..a28a5301fab9a0f7bbe48f8a05418587da6225d6 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
@@ -157,6 +157,7 @@ tools.reload.from.files=Reload files and refresh cache
 tools.reload.from.files.tooltip=Only visible to administrators.
 warning.alien.assessment.item=This question type cannot be processed with the OpenOLAT editor.
 warning.alien.assessment.test=This test cannot be processed with the OpenOLAT editor.
+warning.atleastone=Please, choose at least one element.
 warning.atleastonesection=The section cannot be deleted. A test or a test part must contain at least one section.
 warning.feedback.cutvalue=The feedback is based on the cut value. You need to define it first.
 warning.in.use=The resource is already used for assessment purpose. Editing is limited.