Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java,v
diff -u -r1.15 -r1.16
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java	17 Sep 2007 08:10:23 -0000	1.15
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java	10 Apr 2008 00:50:03 -0000	1.16
@@ -169,11 +169,16 @@
     {
     	String prefix = getPrefix();
     	int size = randomGrouping.getGroups().size();
-        for(int i=1;i<=numOfGroupsTobeCreated;i++)
+        for(int numCreated=0,groupIndex=size+1;numCreated<numOfGroupsTobeCreated;groupIndex++)
         {
-        	String groupName = prefix + " " + new Integer(size + i).toString();  
-            randomGrouping.getGroups().add(Group.createLearnerGroup(randomGrouping,groupName,
-                                                                    new HashSet()));
+        	String groupName = prefix + " " + new Integer(groupIndex).toString();  
+        	// if the name of the group already exists, then createLearnerGroup will return null
+        	// the name may exist if people have been creating and then removing groups in authoring.
+        	Group newGroup = Group.createLearnerGroup(randomGrouping,groupName,new HashSet());
+        	if ( newGroup != null ) {
+        		randomGrouping.getGroups().add(newGroup);
+        		numCreated++;
+        	}
         }
     }