Full rework for response errors