diff --git a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs
index 10e219d..211a96d 100644
--- a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs
+++ b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs
@@ -27,7 +27,10 @@ namespace JiraTimeBotForm.TaskTime
 
             foreach (var repoDirectory in Directory.GetDirectories(settings.RepositoryPath))
             {
-                cancellationToken.ThrowIfCancellationRequested();
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return workTimeItems;
+                }
 
                 //var project = new DirectoryInfo(repoDirectory).Name;
                 if (!Directory.Exists(Path.Combine(repoDirectory, ".hg")))
@@ -46,7 +49,10 @@ namespace JiraTimeBotForm.TaskTime
 
                 foreach (var changeset in log)
                 {
-                    cancellationToken.ThrowIfCancellationRequested();
+                    if (cancellationToken.IsCancellationRequested)
+                    {
+                        return workTimeItems;
+                    }
 
                     if (!changeset.Branch.Contains("-"))
                     {