diff --git a/src/main/java/org/olat/modules/qpool/ui/ItemListController.java b/src/main/java/org/olat/modules/qpool/ui/ItemListController.java
index 0b594c3a87f252094f81fecf07569f82860e6904..13e30a1469dd0ca72bca963197849cd6de06b4c5 100644
--- a/src/main/java/org/olat/modules/qpool/ui/ItemListController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/ItemListController.java
@@ -72,6 +72,10 @@ public class ItemListController extends AbstractItemListController {
 	
 	@Override
 	protected void doSelect(UserRequest ureq, ItemRow row) {
-		fireEvent(ureq, new QItemViewEvent("select-item", row));
+		if(row == null) {
+			showWarning("error.select.one");
+		} else {
+			fireEvent(ureq, new QItemViewEvent("select-item", row));
+		}
 	}
 }
diff --git a/src/main/java/org/olat/modules/qpool/ui/events/QItemViewEvent.java b/src/main/java/org/olat/modules/qpool/ui/events/QItemViewEvent.java
index 2bfb6258dd76368253d82093b4013eae001489e0..214a43d575ff5a2ee915f40486a17ca3d0dd173e 100644
--- a/src/main/java/org/olat/modules/qpool/ui/events/QItemViewEvent.java
+++ b/src/main/java/org/olat/modules/qpool/ui/events/QItemViewEvent.java
@@ -55,6 +55,9 @@ public class QItemViewEvent extends Event {
 	
 	public List<QuestionItemView> getItemList() {
 		if(itemList == null) {
+			if(item == null) {
+				return Collections.emptyList();
+			}
 			return Collections.singletonList(item);
 		}
 		return itemList;