Index: moodle/mod/lamslesson/lib.php
===================================================================
diff -u -r8ad95f62cff6d236e64b253780757b1ca199275c -r6b1f52c1ab782615d06e1b9d27568caa28cda974
--- moodle/mod/lamslesson/lib.php	(.../lib.php)	(revision 8ad95f62cff6d236e64b253780757b1ca199275c)
+++ moodle/mod/lamslesson/lib.php	(.../lib.php)	(revision 6b1f52c1ab782615d06e1b9d27568caa28cda974)
@@ -149,6 +149,9 @@
     # Delete any dependent records here #
     $DB->delete_records('lamslesson', array('id' => $lamslesson->id));
     
+    // Delete grade item for given lamslesson
+    lamslesson_grade_item_delete($lamslesson);
+    
     // delete the lesson from LAMS server
     lamslesson_delete_lesson($USER->username, $lsId);
 
@@ -167,7 +170,7 @@
   global $CFG, $USER;
   if (!isset($CFG->lamslesson_serverid, $CFG->lamslesson_serverkey) || $CFG->lamslesson_serverid == "") {
     print_error(get_string('notsetup', 'lamslesson'));
-    return NULL;
+    return false;
   }
 
   $datetime = lamslesson_get_datetime();