Added extra checks for grader.js