Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -r42213adc78e31e453830ee5c64fcc2716d6e46c1
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision ea79f29aed5c764a223234e456442bc1e49fcf85)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 42213adc78e31e453830ee5c64fcc2716d6e46c1)
@@ -366,7 +366,12 @@
      *      org.lamsfoundation.lams.usermanagement.User)
      */
     public LearnerProgressDTO getProgressDTOByLessonId(Long lessonId, Integer learnerId) {
-	return learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId).getLearnerProgressData();
+    	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
+    	if (progress != null) {
+    		return progress.getLearnerProgressData();
+    	} else {
+    		return null;
+    	}
     }
 
     /**