Added yet another better null check.