diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp
index 37628172..d6dd34e8 100644
--- a/src/sdk/settingsdialog.cpp
+++ b/src/sdk/settingsdialog.cpp
@@ -126,8 +126,13 @@ void TestRepository::doStart()
 void TestRepository::doCancel()
 {
     if (m_downloader) {
+        QString errorString = m_downloader->errorString();
+        if (errorString.isEmpty())
+            errorString = tr("Got a timeout while testing: '%1'").arg(m_repository.displayname());
+        // at the moment the download sends downloadCompleted() if we cancel it, so just
+        disconnect(m_downloader, 0, this, 0);
         m_downloader->cancelDownload();
-        emitFinishedWithError(KDJob::Canceled, m_downloader->errorString());
+        emitFinishedWithError(KDJob::Canceled, errorString);
     }
 }