Update error descriptions.
Improve timeout error message.