Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java,v
diff -u -r1.33.2.1 -r1.33.2.2
--- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	17 Apr 2009 07:22:28 -0000	1.33.2.1
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	20 Apr 2009 04:30:11 -0000	1.33.2.2
@@ -200,6 +200,7 @@
         this.learnerProgresses = learnerProgresses;
         this.liveEditEnabled = liveEditEnabled;
         this.gradebookUserLessons = new HashSet<GradebookUserLesson>();
+        this.marksReleased = false;
     }
     /**
      * Factory method that create a new lesson. It initialized all necessary
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.5 -r1.1.2.6
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	17 Apr 2009 07:22:27 -0000	1.1.2.5
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	20 Apr 2009 04:30:12 -0000	1.1.2.6
@@ -413,11 +413,13 @@
 
 		for (Lesson lesson : lessons) {
 
+		    boolean marksReleased = lesson.getMarksReleased() != null && lesson.getMarksReleased();
+		    
 		    // Dont include lesson in list if the user doesnt have permission
 		    if (!(view == GBGridView.MON_COURSE
 			    && (lesson.getLessonClass().isStaffMember(user) || userService.isUserInRole(user
 				    .getUserId(), organisation.getOrganisationId(), Role.GROUP_MANAGER)) || view == GBGridView.LRN_COURSE
-			    && lesson.getAllLearners().contains(user) && lesson.getMarksReleased())) {
+			    && lesson.getAllLearners().contains(user) && marksReleased)) {
 			continue;
 		    }
 
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	17 Apr 2009 07:22:27 -0000	1.1.2.2
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java	20 Apr 2009 04:30:12 -0000	1.1.2.3
@@ -105,15 +105,18 @@
 
 		logger.debug("user is staff");
 
+		boolean marksReleased = lesson.getMarksReleased() != null && lesson.getMarksReleased();
+		
+		
 		LessonDetailsDTO lessonDetatilsDTO = lesson.getLessonDetails();
 		request.setAttribute("lessonDetails", lessonDetatilsDTO);
-		request.setAttribute("marksReleased", lesson.getMarksReleased());
+		request.setAttribute("marksReleased", marksReleased);
 		
 
 		return mapping.findForward("monitorgradebook");
 	    }
 	} catch (Exception e) {
-	    logger.error("Failed to load gradebook monitor", e);
+	    logger.error("Failed to load gradebook monitor", e); 
 	    return mapping.findForward("error");
 	}
     }
@@ -277,7 +280,9 @@
 
 	Lesson lesson = lessonService.getLesson(lessonID);
 	
-	lesson.setMarksReleased(!lesson.getMarksReleased());
+	boolean marksReleased = lesson.getMarksReleased() != null && lesson.getMarksReleased();
+	
+	lesson.setMarksReleased(!marksReleased);
 	userService.save(lesson);
 
 	response.setContentType("text/plain");