Fix error handing interface