Added more checks
Make grader handle URLs