Changes to timeouts; changes to exception handling.