None values now being handled for amount and amount_minus_fees