Two more broken unit tests due to the exceptions refactoring.