Added additional ExceptionHandling