Handle empty fields correctly