Handle empty fields better