diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
index 65eff24499..885acc8486 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
@@ -2121,15 +2121,15 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
   private ImmutableList<Metadata> extractMetadataFromTrackSelectionArray(
       TrackSelectionArray trackSelectionArray) {
-    ImmutableList.Builder<Metadata> builder = new ImmutableList.Builder<>();
+    ImmutableList.Builder<Metadata> result = new ImmutableList.Builder<>();
     for (int i = 0; i < trackSelectionArray.length; i++) {
       @Nullable TrackSelection trackSelection = trackSelectionArray.get(i);
       if (trackSelection != null) {
-        Format format = trackSelection.getFormat(0);
-        builder.add(format.metadata == null ? new Metadata() : format.metadata);
+        Format format = trackSelection.getFormat(/* index= */ 0);
+        result.add(format.metadata == null ? new Metadata() : format.metadata);
       }
     }
-    return builder.build();
+    return result.build();
   }
 
   private void enableRenderers() throws ExoPlaybackException {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
index 45b7050c6a..a431ba5c93 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/EventLogger.java
@@ -300,8 +300,11 @@ public class EventLogger implements AnalyticsListener {
   public void onStaticMetadataChanged(EventTime eventTime, List<Metadata> metadataList) {
     logd("staticMetadata [" + getEventTimeString(eventTime));
     for (int i = 0; i < metadataList.size(); i++) {
-      logd("  " + i);
-      printMetadata(metadataList.get(i), "    ");
+      @Nullable Metadata currentMetadata = metadataList.get(i);
+      if (currentMetadata != null && currentMetadata.length() != 0) {
+        logd("  " + i);
+        printMetadata(currentMetadata, "    ");
+      }
     }
     logd("]");
   }