Adjustment of Error Handling