null reference fix and dialog wording change.