Add extra check for empty values in conditions