More Exception Cleanup