Handle empty fields