Added more validation when generating vessels