Improved exceptionHandling