If we're going to return errors (no matter how stupid), then we should
test for them!
28 files changed