diff --git a/src/Ombi.Api.Mattermost/Models/MattermostClient.cs b/src/Ombi.Api.Mattermost/Models/MattermostClient.cs
index 96d3e33f4..33489ac57 100644
--- a/src/Ombi.Api.Mattermost/Models/MattermostClient.cs
+++ b/src/Ombi.Api.Mattermost/Models/MattermostClient.cs
@@ -120,8 +120,10 @@ namespace Ombi.Api.Mattermost.Models
                         var attIndex = outMessages[msgCount].Attachments.Count - 1;
 
                         //Get the text lines
-                        lines = att.Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
-
+                        if (!String.IsNullOrEmpty(att.Text))
+                        {
+                            lines = att.Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+                        }
                         foreach (var line in lines)
                         {
                             //Get the total length of all attachments on the current outgoing message
@@ -155,6 +157,7 @@ namespace Ombi.Api.Mattermost.Models
                 {
                     var request = new Request("", _webhookUrl.ToString(), HttpMethod.Post);
                     request.AddJsonBody(msg);
+                    request.AddHeader("Host", _webhookUrl.Host);
                     await api.Request(request);
                 }
             }
diff --git a/src/Ombi.Api/Api.cs b/src/Ombi.Api/Api.cs
index 98fff5e0c..376ce6e92 100644
--- a/src/Ombi.Api/Api.cs
+++ b/src/Ombi.Api/Api.cs
@@ -106,7 +106,15 @@ namespace Ombi.Api
 
         public async Task Request(Request request)
         {
-            using (var httpRequestMessage = new HttpRequestMessage(request.HttpMethod, request.FullUri))
+            object url;
+            if (request.JsonBody.ToString().Contains("Mattermost"))
+            {
+                url = request.BaseUrl;
+            } else
+            {
+                url = request.FullUri;
+            }
+            using (var httpRequestMessage = new HttpRequestMessage(request.HttpMethod, url.ToString()))
             {
                 AddHeadersBody(request, httpRequestMessage);
                 var httpResponseMessage = await _client.SendAsync(httpRequestMessage);