diff --git a/osu.Game/Graphics/Containers/LinkFlowContainer.cs b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
index 51b9acff44..0e3c1592a3 100644
--- a/osu.Game/Graphics/Containers/LinkFlowContainer.cs
+++ b/osu.Game/Graphics/Containers/LinkFlowContainer.cs
@@ -84,7 +84,7 @@ namespace osu.Game.Graphics.Containers
                             {
                                 channelManager.OpenChannel(linkArgument);
                             }
-                            catch (ArgumentException)
+                            catch (ChannelNotFoundException)
                             {
                                 //channel was not found
                             }
diff --git a/osu.Game/Online/Chat/ChannelManager.cs b/osu.Game/Online/Chat/ChannelManager.cs
index 0b658428fe..60e7217756 100644
--- a/osu.Game/Online/Chat/ChannelManager.cs
+++ b/osu.Game/Online/Chat/ChannelManager.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Online.Chat
                 throw new ArgumentNullException(nameof(name));
 
             CurrentChannel.Value = AvailableChannels.FirstOrDefault(c => c.Name == name)
-                                   ?? throw new ArgumentException($"Channel {name} was not found.");
+                                   ?? throw new ChannelNotFoundException(name);
         }
 
         public void OpenUserChannel(User user)
@@ -298,4 +298,14 @@ namespace osu.Game.Online.Chat
             api.Register(this);
         }
     }
+
+
+    public class ChannelNotFoundException : Exception
+    {
+        public ChannelNotFoundException(string channelName)
+            : base($"A channel with the name {channelName} could not be found.")
+        {
+
+        }
+    }
 }