ExceptionHandling improved.