1 files changed, 31 insertions, 28 deletions
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index a547779de..a3c200447 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -869,43 +869,46 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
             var userdata = userDataRepo.GetUserData(user, item);
 
-            writer.WriteElementString(
-                "isuserfavorite",
-                userdata.IsFavorite.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
-
-            if (userdata.Rating.HasValue)
-            {
-                writer.WriteElementString(
-                    "userrating",
-                    userdata.Rating.Value.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
-            }
-
-            if (!item.IsFolder)
+            if (userdata is not null)
             {
                 writer.WriteElementString(
-                    "playcount",
-                    userdata.PlayCount.ToString(CultureInfo.InvariantCulture));
-                writer.WriteElementString(
-                    "watched",
-                    userdata.Played.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
+                "isuserfavorite",
+                userdata.IsFavorite.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
 
-                if (userdata.LastPlayedDate.HasValue)
+                if (userdata.Rating.HasValue)
                 {
                     writer.WriteElementString(
-                        "lastplayed",
-                        userdata.LastPlayedDate.Value.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture).ToLowerInvariant());
+                        "userrating",
+                        userdata.Rating.Value.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
                 }
 
-                writer.WriteStartElement("resume");
+                if (!item.IsFolder)
+                {
+                    writer.WriteElementString(
+                        "playcount",
+                        userdata.PlayCount.ToString(CultureInfo.InvariantCulture));
+                    writer.WriteElementString(
+                        "watched",
+                        userdata.Played.ToString(CultureInfo.InvariantCulture).ToLowerInvariant());
 
-                var runTimeTicks = item.RunTimeTicks ?? 0;
+                    if (userdata.LastPlayedDate.HasValue)
+                    {
+                        writer.WriteElementString(
+                            "lastplayed",
+                            userdata.LastPlayedDate.Value.ToString("yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture).ToLowerInvariant());
+                    }
 
-                writer.WriteElementString(
-                    "position",
-                    TimeSpan.FromTicks(userdata.PlaybackPositionTicks).TotalSeconds.ToString(CultureInfo.InvariantCulture));
-                writer.WriteElementString(
-                    "total",
-                    TimeSpan.FromTicks(runTimeTicks).TotalSeconds.ToString(CultureInfo.InvariantCulture));
+                    writer.WriteStartElement("resume");
+
+                    var runTimeTicks = item.RunTimeTicks ?? 0;
+
+                    writer.WriteElementString(
+                        "position",
+                        TimeSpan.FromTicks(userdata.PlaybackPositionTicks).TotalSeconds.ToString(CultureInfo.InvariantCulture));
+                    writer.WriteElementString(
+                        "total",
+                        TimeSpan.FromTicks(runTimeTicks).TotalSeconds.ToString(CultureInfo.InvariantCulture));
+                }
             }
 
             writer.WriteEndElement();