Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -ra53a5e52a7bd24bf223708957166c92c8c32dd31 -r4fecde9b7bb4326ec626e1938770bdbe0122a4a3
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision a53a5e52a7bd24bf223708957166c92c8c32dd31)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 4fecde9b7bb4326ec626e1938770bdbe0122a4a3)
@@ -432,14 +432,15 @@
 	    progress.setProgressState(fromActivity, LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
 	}
 
-	progress.setProgressState(toActivity, LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
-	toActivity.setReadOnly(true);
+	if (toActivity != null) {    
+		progress.setProgressState(toActivity, LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
+		toActivity.setReadOnly(true);
 		
-	if(!toActivity.isFloating()) {
-		progress.setCurrentActivity(toActivity);
-		progress.setNextActivity(toActivity);
+		if(!toActivity.isFloating()) {
+			progress.setCurrentActivity(toActivity);
+			progress.setNextActivity(toActivity);
+		}
 	}
-
 	
 	learnerProgressDAO.updateLearnerProgress(progress);
 	activityDAO.update(toActivity);