Added toGrade instead of null value

References #558