Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r5ecce39eea63a80b39178bc5a4d6dca74e8440a4 -r9e48cd166db0ae5aeac3f8b864a7d5c44c1a94b4
Binary files differ
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
===================================================================
diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -r9e48cd166db0ae5aeac3f8b864a7d5c44c1a94b4
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java	(.../ChosenGrouper.java)	(revision 34b959260a0f8f8285793a4481a95ca3580eabc5)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java	(.../ChosenGrouper.java)	(revision 9e48cd166db0ae5aeac3f8b864a7d5c44c1a94b4)
@@ -20,14 +20,15 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 package org.lamsfoundation.lams.learningdesign;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.usermanagement.User;
 
 
@@ -43,7 +44,9 @@
 public class ChosenGrouper implements Grouper,Serializable
 {
 
-    /**
+	private static Logger log = Logger.getLogger(ChosenGrouper.class);
+
+	/**
      * @see org.lamsfoundation.lams.learningdesign.Grouper#doGrouping(org.lamsfoundation.lams.learningdesign.Grouping,java.lang.String, org.lamsfoundation.lams.usermanagement.User)
      */
     public void doGrouping(Grouping chosenGrouping, String groupName, User learner)
@@ -60,7 +63,12 @@
      */
     public void doGrouping(Grouping chosenGrouping,String groupName, List learners)
     {
-        chosenGrouping.getGroups().add(Group.createLearnerGroup(chosenGrouping,groupName,
+    	String newGroupName = groupName;
+    	if ( newGroupName == null ) {
+    		newGroupName = "Group"+System.currentTimeMillis();
+    		log.warn("Chosen grouper for grouping "+chosenGrouping.toString()+" didn't get a group name. Selecting default name of "+newGroupName);
+    	}
+        chosenGrouping.getGroups().add(Group.createLearnerGroup(chosenGrouping,newGroupName,
                                                                 new HashSet(learners)));
     }