diff --git a/Disco.Services/Tasks/ScheduledTaskStatus.cs b/Disco.Services/Tasks/ScheduledTaskStatus.cs
index b6d6f76a..2b5fb737 100644
--- a/Disco.Services/Tasks/ScheduledTaskStatus.cs
+++ b/Disco.Services/Tasks/ScheduledTaskStatus.cs
@@ -363,7 +363,13 @@ namespace Disco.Services.Tasks
         }
         public bool WaitUntilFinished(TimeSpan Timeout)
         {
-            return this._tcs.Task.Wait(Timeout);
+            var finished = this._tcs.Task.Wait(Timeout);
+
+            // Return false if task completed, but with an error
+            if (finished)
+                return this.TaskException == null;
+            else
+                return false;
         }
         #endregion