Adjusted error handlers