diff --git a/PlexRequests.Core/StatusChecker.cs b/PlexRequests.Core/StatusChecker.cs
index 94a745535..476a55a45 100644
--- a/PlexRequests.Core/StatusChecker.cs
+++ b/PlexRequests.Core/StatusChecker.cs
@@ -26,8 +26,6 @@
 #endregion
 using System;
 using System.Linq;
-using System.Reflection;
-using System.Runtime.Versioning;
 using System.Threading.Tasks;
 
 using Octokit;
@@ -62,7 +60,10 @@ namespace PlexRequests.Core
             };
 
             var latestRelease = GetLatestRelease();
-
+            if (latestRelease.Result == null)
+            {
+                return new StatusModel { Version = "Unknown" };
+            }
             var latestVersionArray = latestRelease.Result.Name.Split(new[] { 'v' }, StringSplitOptions.RemoveEmptyEntries);
             var latestVersion = latestVersionArray.Length > 1 ? latestVersionArray[1] : string.Empty;
 
diff --git a/PlexRequests.UI/Helpers/HeadphonesSender.cs b/PlexRequests.UI/Helpers/HeadphonesSender.cs
index f066e8de8..17674e891 100644
--- a/PlexRequests.UI/Helpers/HeadphonesSender.cs
+++ b/PlexRequests.UI/Helpers/HeadphonesSender.cs
@@ -111,24 +111,7 @@ namespace PlexRequests.UI.Helpers
                     return false;
                 }
             }
-            var addedArtist = index.FirstOrDefault(x => x.ArtistID == request.ArtistId);
-            var artistName = addedArtist?.ArtistName ?? string.Empty;
-            while (artistName.Contains("Fetch failed"))
-            {
-                Thread.Sleep(WaitTime);
-                await Api.RefreshArtist(Settings.ApiKey, Settings.FullUri, request.ArtistId);
-
-                index = await Api.GetIndex(Settings.ApiKey, Settings.FullUri);
-
-                artistName = index?.FirstOrDefault(x => x.ArtistID == request.ArtistId)?.ArtistName ?? string.Empty;
-                if (counter > CounterMax)
-                {
-                    Log.Trace("Artist fetch has failed. Counter = {0}. Returning false", counter);
-                    Log.Warn("Artist in headphones fetch has failed, we have tried refreshing the artist but no luck.");
-                    return false;
-                }
-            }
-
+            
             counter = 0;
             var artistStatus = index.Where(x => x.ArtistID == request.ArtistId).Select(x => x.Status).FirstOrDefault();
             while (artistStatus != "Active")
@@ -145,6 +128,27 @@ namespace PlexRequests.UI.Helpers
                     return false;
                 }
             }
+
+            var addedArtist = index.FirstOrDefault(x => x.ArtistID == request.ArtistId);
+            var artistName = addedArtist?.ArtistName ?? string.Empty;
+            counter = 0;
+            while (artistName.Contains("Fetch failed"))
+            {
+                Thread.Sleep(WaitTime);
+                await Api.RefreshArtist(Settings.ApiKey, Settings.FullUri, request.ArtistId);
+
+                index = await Api.GetIndex(Settings.ApiKey, Settings.FullUri);
+
+                artistName = index?.FirstOrDefault(x => x.ArtistID == request.ArtistId)?.ArtistName ?? string.Empty;
+                counter++;
+                if (counter > CounterMax)
+                {
+                    Log.Trace("Artist fetch has failed. Counter = {0}. Returning false", counter);
+                    Log.Warn("Artist in headphones fetch has failed, we have tried refreshing the artist but no luck.");
+                    return false;
+                }
+            }
+
             return true;
         }
 
diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs
index fe4addfd0..5b541091c 100644
--- a/PlexRequests.UI/Modules/SearchModule.cs
+++ b/PlexRequests.UI/Modules/SearchModule.cs
@@ -502,8 +502,28 @@ namespace PlexRequests.UI.Modules
 
 
             Log.Debug("This is a new request");
-
+            
             var albumInfo = MusicBrainzApi.GetAlbum(releaseId);
+            DateTime release;
+            DateTimeHelper.CustomParse(albumInfo.ReleaseEvents?.FirstOrDefault()?.date, out release);
+
+            var artist = albumInfo.ArtistCredits?.FirstOrDefault()?.artist;
+            if (artist == null)
+            {
+                return Response.AsJson(new JsonResponseModel { Result = false, Message = "We could not find the artist on MusicBrainz. Please try again later or contact your admin" });
+            }
+
+            var alreadyInPlex = CheckIfTitleExistsInPlex(albumInfo.title, release.ToString("yyyy"), artist.name, PlexType.Music);
+
+            if (alreadyInPlex)
+            {
+                return Response.AsJson(new JsonResponseModel
+                {
+                    Result = false,
+                    Message = $"{albumInfo.title} is already in Plex!"
+                });
+            }
+
             var img = GetMusicBrainzCoverArt(albumInfo.id);
 
             Log.Trace("Album Details:");
@@ -511,14 +531,6 @@ namespace PlexRequests.UI.Modules
             Log.Trace("CoverArt Details:");
             Log.Trace(img.DumpJson());
 
-            DateTime release;
-            DateTimeHelper.CustomParse(albumInfo.ReleaseEvents?.FirstOrDefault()?.date, out release);
-
-            var artist = albumInfo.ArtistCredits?.FirstOrDefault()?.artist;
-            if (artist == null)
-            {
-                return Response.AsJson(new JsonResponseModel {Result = false, Message = "We could not find the artist on MusicBrainz. Please try again later or contact your admin"});
-            }
 
             var model = new RequestedModel
             {
@@ -559,6 +571,7 @@ namespace PlexRequests.UI.Modules
 
                 var sender = new HeadphonesSender(HeadphonesApi, hpSettings, RequestService);
                 sender.AddAlbum(model);
+                model.Approved = true;
                 RequestService.AddRequest(model);
 
                 return