Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
===================================================================
diff -u -rf7067de9edb53585a4c71c06f0cb5f88dd0d902d -rd4f54d36d9532c7a21245e1825be4a739f43da68
--- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(.../OrganisationGroupAction.java)	(revision f7067de9edb53585a4c71c06f0cb5f88dd0d902d)
+++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(.../OrganisationGroupAction.java)	(revision d4f54d36d9532c7a21245e1825be4a739f43da68)
@@ -471,8 +471,8 @@
 	    groupJSON.put("name", group.getName());
 	    groupsJSON.put(groupJSON);
 	}
-	Activity branchingActivity = (Activity) getUserManagementService().findById(Activity.class, activityID);
-	Grouping grouping = branchingActivity.getGrouping();
+	GroupingActivity branchingActivity = (GroupingActivity) getUserManagementService().findById(Activity.class, activityID);
+	Grouping grouping = branchingActivity.getCreateGrouping();
 
 	JSONArray branchesJSON = new JSONArray();
 	SortedSet<Group> groups = new TreeSet<Group>(grouping.getGroups());