Bug 836106: Ensure basket data is in sync with ET.

Fix issue with 500 errors on ET errors.