Some improvments in handling CalculationExceptoons