Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v
diff -u -r1.99 -r1.100
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	6 Jul 2009 07:25:49 -0000	1.99
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	13 Jan 2010 03:07:29 -0000	1.100
@@ -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;
+    	}
     }
 
     /**