Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java,v
diff -u -r1.10 -r1.11
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java	6 Jun 2006 02:36:36 -0000	1.10
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java	6 Jun 2006 06:05:17 -0000	1.11
@@ -132,7 +132,7 @@
     public Group createGroup(Grouping grouping, String name) throws GroupingException
     {
     	int currentSize = grouping.getGroups().size(); 
-    	if ( currentSize == grouping.getMaxNumberOfGroups() ) {
+    	if ( grouping.getMaxNumberOfGroups()!=null && currentSize == grouping.getMaxNumberOfGroups() ) {
     		String error = "Tried to add group "+name+" to grouping "+grouping+". Exceeded max number of groups - current size is "+currentSize;
     		log.error(error); 
     		throw new GroupingException(error);
Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java,v
diff -u -r1.26 -r1.27
--- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	15 May 2006 07:17:17 -0000	1.26
+++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java	6 Jun 2006 06:05:17 -0000	1.27
@@ -450,12 +450,12 @@
     
     public String setupURLWithActivityLessonID(Activity activity, Long lessonID, String learnerURL) {
         String url = learnerURL;
-        if ( activity != null ) {
+        if ( url!=null && activity != null ) {
         	url = WebUtil.appendParameterToURL(url,
         		AttributeNames.PARAM_ACTIVITY_ID,
 				activity.getActivityId().toString());
         }
-        if ( lessonID != null ) {
+        if ( url!=null && lessonID != null ) {
         	url = WebUtil.appendParameterToURL(url,
                		AttributeNames.PARAM_LESSON_ID,
                		lessonID.toString());
Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java,v
diff -u -r1.15 -r1.16
--- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	8 Mar 2006 12:02:14 -0000	1.15
+++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java	6 Jun 2006 06:05:17 -0000	1.16
@@ -410,7 +410,9 @@
      */
     public static String appendParameterDeliminator(String url)
     {
-        if(StringUtils.containsNone(url,"?"))
+    	if(url==null )
+    		return null;
+    	else if(StringUtils.containsNone(url,"?"))
             return url+"?";
         else
             return url+"&";