diff --git a/src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java b/src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java
index 7d6693993c3b66f199b6f56086c26cc06ebe3c31..40dbee1311b28275b17d36f8d4af7706253d815d 100644
--- a/src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java
+++ b/src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java
@@ -187,12 +187,13 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 		List<EnrollmentRow> enrollmentRows = enrollmentManager.getEnrollments(getIdentity(), groupKeys, null, 256);
 		Map<Long,EnrollmentRow> enrollmentMap = enrollmentRows.stream().collect(Collectors.toMap(EnrollmentRow::getKey, g -> g, (u, v) -> u));
 
-		easyGroupTableRows = new ArrayList<ENEditGroupTableContentRow>();
+		easyGroupTableRows = new ArrayList<>();
 		for (Long groupKey : groupKeys) {
 			BusinessGroup group = groupMap.get(groupKey);
-			EnrollmentRow enrollment = enrollmentMap.get(groupKey);
-			
-			easyGroupTableRows.add(new ENEditGroupTableContentRow(group, enrollment));
+			if(group != null) {
+				EnrollmentRow enrollment = enrollmentMap.get(groupKey);
+				easyGroupTableRows.add(new ENEditGroupTableContentRow(group, enrollment));
+			}
 		}
 
 		easyGroupTableModel.setObjects(easyGroupTableRows);