Messed with exceptions - should work now