Added check for null amount_other field