Fix calculation errors not being returned