added additional checks
workaround fo grader usin restler