Fixed handling aggregate exceptions but now the timeouts are failing.