Index: moodle/mod/lamslesson/lib.php
===================================================================
RCS file: /usr/local/cvsroot/moodle/mod/lamslesson/lib.php,v
diff -u -r1.24 -r1.25
--- moodle/mod/lamslesson/lib.php	24 Feb 2017 11:52:53 -0000	1.24
+++ moodle/mod/lamslesson/lib.php	14 Apr 2017 11:07:27 -0000	1.25
@@ -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();