Added a validator checking empty values and organization errors