Added more wines and caught some exceptions in the building of the wine list.