Index: lams_learning/web/close.jsp
===================================================================
diff -u -r3bf7525eab3ad0de6108886543f8f507b8e20033 -rc7d9c7ec6090e62933ae91ca029b6402fa7fb974
--- lams_learning/web/close.jsp	(.../close.jsp)	(revision 3bf7525eab3ad0de6108886543f8f507b8e20033)
+++ lams_learning/web/close.jsp	(.../close.jsp)	(revision c7d9c7ec6090e62933ae91ca029b6402fa7fb974)
@@ -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;