Now catching errors correctly, all tests succeed
Catching errors correctly, all tests succeed.