FIX: Removed bad null return from OrderTotalCalculator