Error handling repairs