diff --git a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
index 4193cc797a..7fbea2f401 100644
--- a/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
+++ b/MediaBrowser.Api/WebSocket/LogFileWebSocketListener.cs
@@ -111,9 +111,9 @@ namespace MediaBrowser.Api.WebSocket
                     {
                         var line = await reader.ReadLineAsync().ConfigureAwait(false);
 
-                        if (line.IndexOf("Info", StringComparison.OrdinalIgnoreCase) != -1 ||
-                            line.IndexOf("Warn", StringComparison.OrdinalIgnoreCase) != -1 ||
-                            line.IndexOf("Error", StringComparison.OrdinalIgnoreCase) != -1)
+                        if (line.IndexOf("Info -", StringComparison.OrdinalIgnoreCase) != -1 ||
+                            line.IndexOf("Warn -", StringComparison.OrdinalIgnoreCase) != -1 ||
+                            line.IndexOf("Error -", StringComparison.OrdinalIgnoreCase) != -1)
                         {
                             lines.Add(line);
                         }
diff --git a/MediaBrowser.Providers/Music/LastfmHelper.cs b/MediaBrowser.Providers/Music/LastfmHelper.cs
index 0c67e7ea70..7c83cec6b4 100644
--- a/MediaBrowser.Providers/Music/LastfmHelper.cs
+++ b/MediaBrowser.Providers/Music/LastfmHelper.cs
@@ -39,6 +39,19 @@ namespace MediaBrowser.Providers.Music
 
         public static void SaveImageInfo(IApplicationPaths appPaths, ILogger logger, string musicBrainzId, string url, string size)
         {
+            if (appPaths == null)
+            {
+                throw new ArgumentNullException("appPaths");
+            }
+            if (string.IsNullOrEmpty(musicBrainzId))
+            {
+                throw new ArgumentNullException("musicBrainzId");
+            }
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentNullException("url");
+            }
+
             var cachePath = Path.Combine(appPaths.CachePath, "lastfm", musicBrainzId, "image.txt");
 
             try
diff --git a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
index 821a6de8f1..461ff2a65c 100644
--- a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
@@ -47,7 +47,9 @@ namespace MediaBrowser.Providers.Savers
                     "Format3D",
                     "Metascore",
                     "MPAARating",
-                    "MusicbrainzId",
+                    "MusicBrainzArtistId",
+                    "MusicBrainzAlbumArtistId",
+                    "MusicBrainzAlbumId",
                     "MusicBrainzReleaseGroupId",
                     "Overview",
                     "Persons",