Handle HTTP 400 errors on makaba. Fixes #696