Re-introduce null check.