Fixed null modification/validation