Simplify these tests
Check existence rather than rescue exceptions