Fixed rounding logic when null value and new grade