Created originally on Bitbucket by alcarithemad (Colin)
Changesets for this Pull Request have not been imported, because it had been already declined on Bitbucket. Marked as closed by the import user.
This fixes the test failures in
They're error cases that weren't handled correctly before.