Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -r61e7bbf20d65e2ecb5e50f3154e52264003defa1 -r16f9388f679b52d0d2e010cc3588bb33fc73459b
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 61e7bbf20d65e2ecb5e50f3154e52264003defa1)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 16f9388f679b52d0d2e010cc3588bb33fc73459b)
@@ -378,8 +378,8 @@
 
     /**
      * @see org.lamsfoundation.lams.gradebook.service.IGradebookService#updateUserActivityGradebookMark(org.lamsfoundation.lams.lesson.Lesson,
-     *      org.lamsfoundation.lams.usermanagement.User, org.lamsfoundation.lams.learningdesign.Activity,
-     *      java.lang.Double)
+     *      org.lamsfoundation.lams.usermanagement.User,
+     *      org.lamsfoundation.lams.learningdesign.Activity, java.lang.Double)
      */
     public void updateUserActivityGradebookMark(Lesson lesson, User learner, Activity activity, Double mark,
 	    Boolean markedInGradebook) {
@@ -916,7 +916,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());
+		    }
 		}
 	    }
 	}
@@ -983,7 +985,8 @@
     }
 
     /**
-     * Gets the outputs for a tool activity and returns the html for the ouputs cell in the grid
+     * Gets the outputs for a tool activity and returns the html for the ouputs
+     * cell in the grid
      * 
      * @param toolAct
      * @param toolSession