Index: lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
===================================================================
diff -u -rc1af58895d976d53fba617a4a1eaafc071b8f169 -r12fb6744f0ae3dd8e31b69d333bfb4e3d44e8cf6
--- lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java	(.../SPEnrolmentServlet.java)	(revision c1af58895d976d53fba617a4a1eaafc071b8f169)
+++ lams_central/src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java	(.../SPEnrolmentServlet.java)	(revision 12fb6744f0ae3dd8e31b69d333bfb4e3d44e8cf6)
@@ -182,7 +182,7 @@
 
 		// map of course code -> subcourse code -> subcourse
 		Map<String, ConcurrentMap<String, Organisation>> allExistingSubcourses = allExistingSubcourseObjects
-			.parallelStream()
+			.parallelStream().filter(o -> o.getParentOrganisation() != null)
 			.collect(Collectors.groupingByConcurrent(o -> o.getParentOrganisation().getCode(),
 				Collectors.toConcurrentMap(Organisation::getCode, o -> o)));