More fixes for expected error exceptions.
[ci skip]