Another null exception crash fix.