Changes to exceptionHandlers