diff --git a/src/Podsync/Controllers/DownloadController.cs b/src/Podsync/Controllers/DownloadController.cs
index 7a9833b..ce9bd93 100644
--- a/src/Podsync/Controllers/DownloadController.cs
+++ b/src/Podsync/Controllers/DownloadController.cs
@@ -55,7 +55,13 @@ namespace Podsync.Controllers
                     ["VideoId"] = videoId
                 });
 
-                return BadRequest("Could nou resolve URL");
+                var response = "Could nou resolve URL";
+                if (ex is InvalidOperationException)
+                {
+                    response = ex.Message;
+                }
+
+                return BadRequest(response);
             }
 
             // Report metrics
diff --git a/src/Podsync/Services/Resolver/YtdlWrapper.cs b/src/Podsync/Services/Resolver/YtdlWrapper.cs
index 734fd2c..b7ad564 100644
--- a/src/Podsync/Services/Resolver/YtdlWrapper.cs
+++ b/src/Podsync/Services/Resolver/YtdlWrapper.cs
@@ -8,8 +8,8 @@ namespace Podsync.Services.Resolver
 {
     public class YtdlWrapper : IResolverService
     {
-        private static readonly TimeSpan ProcessWaitTimeout = TimeSpan.FromSeconds(30);
-        private static readonly TimeSpan WaitTimeoutBetweenFailedCalls = TimeSpan.FromSeconds(15);
+        private static readonly TimeSpan ProcessWaitTimeout = TimeSpan.FromMinutes(1);
+        private static readonly TimeSpan WaitTimeoutBetweenFailedCalls = TimeSpan.FromSeconds(30);
 
         private const string Ytdl = "youtube-dl";