Fix bug 1088177: Upgrade basket client.

Also add non-form error message to form page.