Restructured ErrorHandling