Adding null guard for field schema