Updated error handling conditionals for new fields