Remove errors when we cancel
Better validation