Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
===================================================================
diff -u -refe4208a1e8dd4ff49e11826b7039f7d04d2ac9e -rd7797468cd2f9f6f327ea62eb074f89104743cf9
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	(.../ActivityAction.java)	(revision efe4208a1e8dd4ff49e11826b7039f7d04d2ac9e)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	(.../ActivityAction.java)	(revision d7797468cd2f9f6f327ea62eb074f89104743cf9)
@@ -129,6 +129,9 @@
 		
 		// Find requested activity
 		Long activityId = activityForm.getActivityId();
+		if (activityId == null) {
+			return mapping.findForward("error");
+		}
 		Activity activity = getActivity(activityId.longValue(), progress);
 		if (activity == null) {
 			// TODO: log error
@@ -241,7 +244,7 @@
 		}
 		
 		// Set activity as complete
-		LearnerProgress nextProgress = learnerService.calculateProgress(activity.getActivityId().longValue(), learner, lesson);
+		LearnerProgress nextProgress = learnerService.calculateProgress(activity, learner, lesson);
 
 		//ActionForward forward = displayNextActivity(activity, nextProgress, mapping, activityForm, request, response);
 		ActionForward forward = displayNextActivity(progress, nextProgress, mapping, activityForm, request, response);