Improved error handling for high load situations