Remove now unnecessary null check