> Maybe I'm missing something, but it seems to me that this bundle would be a lot simpler without this special case for errors, too.

I've made the distinction as I feared that a wrong class would be modified but the conversion table show me that it is not the case.
I've made the modification and the acceptance tests are still ok.