diff --git a/Sources/Stylophone.Common/ViewModels/Bases/LibraryViewModelBase.cs b/Sources/Stylophone.Common/ViewModels/Bases/LibraryViewModelBase.cs
index 2d7fec3..256e884 100644
--- a/Sources/Stylophone.Common/ViewModels/Bases/LibraryViewModelBase.cs
+++ b/Sources/Stylophone.Common/ViewModels/Bases/LibraryViewModelBase.cs
@@ -50,11 +50,12 @@ public async Task LoadDataAsync()
             var albumList = await _mpdService.SafelySendCommandAsync(new ListCommand(MpdTags.Album));
             var albumSortList = await _mpdService.SafelySendCommandAsync(new ListCommand(MpdTags.AlbumSort));
 
-            // Create a list of tuples
-            var response = albumList.Zip(albumSortList, (album, albumSort) => new Album{ Name = album, SortName = albumSort });
-
-            if (albumSortList != null)
+            if (albumList != null && albumSortList != null)
+            {
+                // Create a list of tuples
+                var response = albumList.Zip(albumSortList, (album, albumSort) => new Album { Name = album, SortName = albumSort });
                 GroupAlbumsByName(response);
+            }
 
             if (Source.Count > 0)
                 FilteredSource.AddRange(Source);