Could you add some tests to make sure there's some more contextual information in the errors returned?