diff --git a/lib/ui/dialogs/general_popup_dialog.dart b/lib/ui/dialogs/general_popup_dialog.dart
index fd9c1126..b084b5ee 100644
--- a/lib/ui/dialogs/general_popup_dialog.dart
+++ b/lib/ui/dialogs/general_popup_dialog.dart
@@ -678,7 +678,7 @@ Future<void> showGeneralPopupDialog(
                           const SizedBox(width: 16.0),
                           if (forceSingleArtwork!)
                             NamidaHero(
-                              tag: heroTag ?? '$comingFromQueue${index}_sussydialogs_${tracks.first.path}$additionalHero',
+                              tag: heroTag ?? '$comingFromQueue${index}_sussydialogs_${tracks.firstOrNull?.path}$additionalHero',
                               child: ArtworkWidget(
                                 key: Key(tracks.pathToImage),
                                 track: tracks.trackOfImage,
@@ -1136,7 +1136,7 @@ Future<void> showGeneralPopupDialog(
                                   color: colorDelightened.value,
                                   compact: true,
                                   title: '${lang.PLAY_AFTER}: ${(Player.inst.latestInsertedIndex - Player.inst.currentIndex).displayTrackKeyword}',
-                                  subtitle: "${playAfterTrack.artistsList.first} - ${playAfterTrack.title}",
+                                  subtitle: [playAfterTrack.artistsList.firstOrNull, playAfterTrack.title].joinText(separator: ' - '),
                                   icon: Broken.hierarchy_square,
                                   onTap: () {
                                     NamidaNavigator.inst.closeDialog();