diff --git a/libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java b/libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java
index 1fe7c6ff8b..5c6b54a7b0 100644
--- a/libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java
+++ b/libraries/common/src/main/java/androidx/media3/common/TrackSelectionOverrides.java
@@ -300,7 +300,7 @@ public final class TrackSelectionOverrides implements Bundleable {
           TrackSelectionOverride trackSelectionOverride = trackSelectionOverrides.get(i);
           builder.put(trackSelectionOverride.trackGroup, trackSelectionOverride);
         }
-        return new TrackSelectionOverrides(builder.build());
+        return new TrackSelectionOverrides(builder.buildOrThrow());
       };
 
   private static String keyForField(@FieldNumber int field) {
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java
index 9a8c13f4ee..620d971217 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/AnalyticsCollector.java
@@ -1122,7 +1122,7 @@ public class AnalyticsCollector
           addTimelineForMediaPeriodId(builder, currentPlayerMediaPeriod, preferredTimeline);
         }
       }
-      mediaPeriodTimelines = builder.build();
+      mediaPeriodTimelines = builder.buildOrThrow();
     }
 
     private void addTimelineForMediaPeriodId(
diff --git a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java
index 2cec4df390..9a6c9b8387 100644
--- a/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java
+++ b/libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/MediaDescription.java
@@ -324,6 +324,6 @@ import java.util.HashMap;
       String[] parameterPair = Util.splitAtFirst(parameter, "=");
       formatParametersBuilder.put(parameterPair[0], parameterPair[1]);
     }
-    return formatParametersBuilder.build();
+    return formatParametersBuilder.buildOrThrow();
   }
 }
diff --git a/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java b/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java
index 52ac808e85..b84c156a7a 100644
--- a/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java
+++ b/libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspMediaTrackTest.java
@@ -161,7 +161,7 @@ public class RtspMediaTrackTest {
                 .put("indexlength", "3")
                 .put("indexdeltalength", "3")
                 .put("config", "1208")
-                .build());
+                .buildOrThrow());
 
     assertThat(format).isEqualTo(expectedFormat);
   }
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java
index f57a5e784a..314726f85e 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeExoMediaDrm.java
@@ -554,7 +554,7 @@ public final class FakeExoMediaDrm implements ExoMediaDrm {
         optionalParameters.put(optionalParameterKeys.get(i), optionalParameterValues.get(i));
       }
 
-      this.optionalParameters = optionalParameters.build();
+      this.optionalParameters = optionalParameters.buildOrThrow();
     }
 
     public byte[] toByteArray() {
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java
index 4d647380dc..99b75bd9a7 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/WebServerDispatcher.java
@@ -406,7 +406,7 @@ public class WebServerDispatcher extends Dispatcher {
       @Nullable String qvalue = matcher.group(2);
       parsedEncodings.put(contentCoding, qvalue == null ? -1f : Float.parseFloat(qvalue));
     }
-    return parsedEncodings.build();
+    return parsedEncodings.buildOrThrow();
   }
 
   /**
@@ -432,7 +432,7 @@ public class WebServerDispatcher extends Dispatcher {
           ImmutableMap.<String, Float>builder()
               .putAll(acceptEncodingHeader)
               .put("identity", -1f)
-              .build();
+              .buildOrThrow();
     }
     float asteriskQvalue = acceptEncodingHeader.getOrDefault("*", 0f);
     @Nullable String preferredContentCoding = null;