Ignore empty rows; handle errors better