Put back validations for goal. Goal define still lets through empty string by defaulting to original value.