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.96.4.3 -r1.96.4.3.4.1
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	1 May 2009 06:13:55 -0000	1.96.4.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	13 Jan 2010 03:05:59 -0000	1.96.4.3.4.1
@@ -372,15 +372,20 @@
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getProgressById(java.lang.Long)
      */
     public LearnerProgress getProgressById(Long progressId) {
-	return learnerProgressDAO.getLearnerProgress(progressId);
+    	return learnerProgressDAO.getLearnerProgress(progressId);
     }
 
     /**
      * @see org.lamsfoundation.lams.learning.service.ICoreLearnerService#getProgressDTOByLessonId(java.lang.Long,
      *      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;
+    	}
     }
 
     /**