More Exceptionhandling cleanups