Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.1.2.14 -r1.1.2.14.2.1
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	10 Jun 2009 05:08:26 -0000	1.1.2.14
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	16 Jul 2009 04:05:31 -0000	1.1.2.14.2.1
@@ -922,7 +922,9 @@
 		if (activityState == LearnerProgress.ACTIVITY_ATTEMPTED) {
 		    gactivityDTO.setStartDate(learnerProgress.getAttemptedActivities().get(activity));
 		} else {
-		    gactivityDTO.setStartDate(learnerProgress.getCompletedActivities().get(activity).getStartDate());
+		    if (learnerProgress.getCompletedActivities() != null && learnerProgress.getCompletedActivities().get(activity) != null) {
+			gactivityDTO.setStartDate(learnerProgress.getCompletedActivities().get(activity).getStartDate());
+		    }
 		}
 	    }
 	}