Added handling for error spikes