Null check, and minimize the diff.