Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java =================================================================== diff -u -rfbeb734a6ccb4d08e312fbf1b7fc6eb7bae46535 -rc6bad3471368f1efe540cf05d623c570ef468a0a --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision fbeb734a6ccb4d08e312fbf1b7fc6eb7bae46535) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision c6bad3471368f1efe540cf05d623c570ef468a0a) @@ -335,10 +335,13 @@ } LessonClass lessonClass = lesson.getLessonClass(); + if ( lessonClass == null ) { throw new LessonServiceException("Lesson class for "+lessonId+" does not exist. Unable to add staff member to lesson."); } - + + lessonDAO.initialize(lessonClass.getStaffGroup()); + boolean ret = lessonClass.addStaffMember(user); if ( ret ) { lessonClassDAO.updateLessonClass(lessonClass);