Added a missing exception clause, improved timeout error message.