Adding a couple exchange rate null checks