Add more tests for unhappy path catches