Improving defer with timeout error message.