Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java,v
diff -u -r1.27.2.1 -r1.27.2.2
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	22 Apr 2009 04:26:28 -0000	1.27.2.1
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	1 May 2009 03:00:14 -0000	1.27.2.2
@@ -232,7 +232,7 @@
 	    progress = learnerService.completeActivity(learnerId, currentActivity, progress);
 	}
 
-	if (currentActivity.isFloating())
+	if (currentActivity != null && currentActivity.isFloating())
 	    return actionMappings.getCloseForward(currentActivity, lesson.getLessonId());
 
 	LearningWebUtil.putActivityInRequest(request, progress.getNextActivity(), learnerService);