Edit: Code now works with throwing exceptions (had to edit @test code, so...

Edit: Code now works with throwing exceptions (had to edit @test code, so posssibly something wrong)