fixed logic for safe list of NAs