Changed exceptionHandling.