This is then broken in every other place as well (and IIRC also in Messaging). Will address it separately.
I'd like to use an error, not an exception. Or would you prefer exception?