add checks for IFNULL/IFNONNULL to PSC