Index: lams_learning/web/close.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/close.jsp,v
diff -u -r1.5 -r1.6
--- lams_learning/web/close.jsp	8 Feb 2009 23:52:54 -0000	1.5
+++ lams_learning/web/close.jsp	17 Feb 2009 01:51:52 -0000	1.6
@@ -32,9 +32,11 @@
               close the parent if you want to close the window. Live with two "close" messages for now. Eventually we 
 	      want to display the wait for the first one, and then close on the second. For that we will need
               location.href = "<c:out value="${param.waitURL}" escapeXml="false"/>"; --%>
-        } else if ( window.parent.name != "LearnerActivity" ) {
+        } else if ( window.parent.name != "LearnerActivity" ) {        	
         	<%-- In the main learner window, so want to continue with the main progress --%>
-            location.href = "<c:out value="${param.nextURL}" escapeXml="false"/>";
+        	<c:if test="${param.nextURL != null}">
+            	location.href = "<c:out value="${param.nextURL}" escapeXml="false"/>";
+            </c:if>
         }
     }
     window.onload = doCloseRedirect;