diff --git a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
index b0076aceb..b308f11df 100644
--- a/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
+++ b/ErsatzTV.Core/Scheduling/PlayoutBuilder.cs
@@ -408,7 +408,8 @@ namespace ErsatzTV.Core.Scheduling
                 {
                     CollectionType = item.CollectionType,
                     Id = item.TelevisionSeasonId.Value
-                }
+                },
+                _ => throw new ArgumentOutOfRangeException(nameof(item))
             };
 
         private class CollectionKey : Record<CollectionKey>
diff --git a/ErsatzTV/Pages/MovieList.razor b/ErsatzTV/Pages/MovieList.razor
index 20d0b2b30..add940841 100644
--- a/ErsatzTV/Pages/MovieList.razor
+++ b/ErsatzTV/Pages/MovieList.razor
@@ -20,7 +20,7 @@
 </MudContainer>
 
 <MudContainer MaxWidth="MaxWidth.False" Class="media-card-grid">
-    @foreach (MovieCardViewModel card in _data.Cards)
+    @foreach (MovieCardViewModel card in _data.Cards.Where(d => !string.IsNullOrWhiteSpace(d.Title)))
     {
         <MediaCard Data="@card"
                    DataRefreshed="@(() => RefreshData())"
diff --git a/ErsatzTV/Shared/MediaCard.razor b/ErsatzTV/Shared/MediaCard.razor
index ac5a97799..30d598686 100644
--- a/ErsatzTV/Shared/MediaCard.razor
+++ b/ErsatzTV/Shared/MediaCard.razor
@@ -82,7 +82,7 @@
             return Placeholder;
         }
 
-        string first = sortTitle.Substring(0, 1).ToUpperInvariant();
+        string first = sortTitle?.Substring(0, 1).ToUpperInvariant() ?? string.Empty;
         return int.TryParse(first, out _) ? "#" : first;
     }