Eliminated one more null check.