2 files changed, 7 insertions, 1 deletions
diff --git a/src/content/dependencies/generateAlbumArtworkColumn.js b/src/content/dependencies/generateAlbumArtworkColumn.js
index 5346e56b..cc27e6b4 100644
--- a/src/content/dependencies/generateAlbumArtworkColumn.js
+++ b/src/content/dependencies/generateAlbumArtworkColumn.js
@@ -31,6 +31,10 @@ export default {
             .map(artwork => relation('generateCoverArtwork', artwork))
 
         : []),
+
+    musicVideos:
+      album.musicVideos.map(musicVideo =>
+        relation('generateMusicVideo', musicVideo, album)),
   }),
 
   generate(relations, {html}) {
@@ -46,6 +50,7 @@ export default {
       relations.firstCovers,
       relations.albumArtInfoBox,
       relations.restCovers,
+      relations.musicVideos,
     ]);
   },
 };
diff --git a/src/content/dependencies/generateMusicVideoDateLine.js b/src/content/dependencies/generateMusicVideoDateLine.js
index 0c30ead5..98992584 100644
--- a/src/content/dependencies/generateMusicVideoDateLine.js
+++ b/src/content/dependencies/generateMusicVideoDateLine.js
@@ -2,6 +2,7 @@ function sameDay(musicVideo, thing) {
   if (!musicVideo.dateIsSpecified) return null;
 
   const compare = (a, b) =>
+    a && b &&
     a.toDateString() === b.toDateString();
 
   const album = thing.isTrack ? thing.album : thing;
@@ -15,7 +16,7 @@ function sameDay(musicVideo, thing) {
     }
   }
 
-  if (compare(musicVideo.date, track.date)) {
+  if (compare(musicVideo.date, track?.date)) {
     return 'track';
   }