Fixed error handling for timed out requests