Properly scope exceptions