Improving diagnostic messages for timeouts