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.36.2.7 -r1.36.2.8
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	15 Sep 2015 17:32:45 -0000	1.36.2.7
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	15 Sep 2015 17:36:02 -0000	1.36.2.8
@@ -1356,7 +1356,7 @@
 	final String IMAGES_DIR = Configuration.get(ConfigurationKeys.SERVER_URL) + "images";
 	if (learnerProgress != null) {
 	    byte statusByte = learnerProgress.getProgressState(activity);
-	    if (statusByte == LearnerProgress.ACTIVITY_ATTEMPTED) {
+	    if (statusByte == LearnerProgress.ACTIVITY_ATTEMPTED && learnerProgress.getCurrentActivity() != null) {
 		return "<img src='" + IMAGES_DIR + "/cog.png' title='"
 			+ StringEscapeUtils.escapeHtml(learnerProgress.getCurrentActivity().getTitle()) + "' />";
 	    } else if (statusByte == LearnerProgress.ACTIVITY_COMPLETED) {