Fix to avoid NoneType + Decimal error