Changed from UNSET to undef & updated verification logic