diff --git a/NadekoBot/Classes/Music/StreamRequest.cs b/NadekoBot/Classes/Music/StreamRequest.cs
index 627579ed..7ea9e4ea 100644
--- a/NadekoBot/Classes/Music/StreamRequest.cs
+++ b/NadekoBot/Classes/Music/StreamRequest.cs
@@ -54,11 +54,10 @@ namespace NadekoBot.Classes.Music {
             this.Server = e.Server;
             this.Query = query;
             this.RadioLink = radio;
-            Task.Run(() => ResolveStreamLink());
             mc.SongQueue.Add(this);
         }
 
-        private async void ResolveStreamLink() {
+        public async Task Resolve() {
             string uri = null;
             try {
                 if (RadioLink) {
diff --git a/NadekoBot/Modules/Music.cs b/NadekoBot/Modules/Music.cs
index 23e99484..e73ccdc4 100644
--- a/NadekoBot/Modules/Music.cs
+++ b/NadekoBot/Modules/Music.cs
@@ -262,6 +262,8 @@ namespace NadekoBot.Modules {
             if (string.IsNullOrWhiteSpace(query) || query.Length < 3)
                 return;
 
+            query = query.Trim();
+
             if (IsRadioLink(query)) {
                 radio = true;
                 query = await HandleStreamContainers(query);
@@ -284,7 +286,7 @@ namespace NadekoBot.Modules {
             if (player.SongQueue.Count >= 25) return;
 
             try {
-                var sr = await Task.Run(() => new StreamRequest(e, query, player, radio));
+                var sr = new StreamRequest(e, query, player, radio);
 
                 if (sr == null)
                     throw new NullReferenceException("StreamRequest is null.");
@@ -292,15 +294,12 @@ namespace NadekoBot.Modules {
                 Message qmsg = null;
                 Message msg = null;
                 if (!silent) {
-                    qmsg = await e.Channel.SendMessage("🎵 `Searching...`");
-                    sr.OnResolving += async () => {
-                        await qmsg.Edit($"🎵 `Resolving`... \"{query}\"");
-                    };
+                    qmsg = await e.Channel.SendMessage("🎵 `Searching / Resolving...`");
                     sr.OnResolvingFailed += async (err) => {
-                        await qmsg.Edit($"💢 🎵 `Resolving failed` for **{query}**");
+                        await qmsg?.Edit($"💢 🎵 `Resolving failed` for **{query}**");
                     };
                     sr.OnQueued += async () => {
-                        await qmsg.Edit($"🎵`Queued`{sr.FullPrettyName}");
+                        await qmsg?.Edit($"🎵`Queued`{sr.FullPrettyName}");
                     };
                 }
                 sr.OnCompleted += async () => {
@@ -322,6 +321,7 @@ namespace NadekoBot.Modules {
                 sr.OnBuffering += async () => {
                     msg = await e.Send($"🎵`Buffering...`{sr.FullPrettyName}");
                 };
+                sr.Resolve();
             } catch (Exception ex) {
                 Console.WriteLine();
                 await e.Send($"💢 {ex.Message}");
@@ -351,7 +351,7 @@ namespace NadekoBot.Modules {
                 try {
                     var m = Regex.Match(file, "File1=(?<url>.*?)\\n");
                     var res = m.Groups["url"]?.ToString();
-                    return res;
+                    return res?.Trim();
                 }
                 catch {
                     Console.WriteLine($"Failed reading .pls:\n{file}");
@@ -365,9 +365,9 @@ namespace NadekoBot.Modules {
                    C:\xxx5xx\x6xxxxxx\x7xxxxx\xx.mp3
                 */
                 try {
-                    var m = Regex.Match(file, "^[^#](?<url>.*)");
+                    var m = Regex.Match(file, "(?<url>^[^#].*)");
                     var res = m.Groups["url"]?.ToString();
-                    return res;
+                    return res?.Trim();
                 }
                 catch {
                     Console.WriteLine($"Failed reading .m3u:\n{file}");
@@ -380,7 +380,7 @@ namespace NadekoBot.Modules {
                 try {
                     var m = Regex.Match(file, "<ref href=\"(?<url>.*?)\"");
                     var res = m.Groups["url"]?.ToString();
-                    return res;
+                    return res?.Trim();
                 }
                 catch {
                     Console.WriteLine($"Failed reading .asx:\n{file}");