Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -rb298c498f26d7e881bc2a2064d62988c51be3b1a -r7200a257d9a499a5cf59190b2d8d3ac408422f12
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision b298c498f26d7e881bc2a2064d62988c51be3b1a)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 7200a257d9a499a5cf59190b2d8d3ac408422f12)
@@ -1362,7 +1362,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) {