Expand check for empty strings