diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/langmodel/ClassName.java b/src/tools/android/java/com/google/devtools/build/android/desugar/langmodel/ClassName.java
index c596f0e..8327873 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/langmodel/ClassName.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/langmodel/ClassName.java
@@ -109,7 +109,7 @@
           .put("javadesugar/testing/", "jd$/testing/")
           .put("sun/misc/Desugar", "j$/sun/misc/Desugar")
           .put("jdk/internal/util/", "j$/jdk/internal/util/")
-          .build();
+          .buildOrThrow();
 
   public static final TypeMapper SHADOWED_TO_MIRRORED_TYPE_MAPPER =
       new TypeMapper(ClassName::shadowedToMirrored);
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/langmodel/LangModelHelper.java b/src/tools/android/java/com/google/devtools/build/android/desugar/langmodel/LangModelHelper.java
index f40c400..773aa3f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/langmodel/LangModelHelper.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/langmodel/LangModelHelper.java
@@ -48,7 +48,7 @@
           .put(2, 1, Opcodes.DUP2_X1)
           .put(1, 2, Opcodes.DUP_X2)
           .put(2, 2, Opcodes.DUP2_X2)
-          .build();
+          .buildOrThrow();
 
   /**
    * Returns the operation code for pop operations with a single instruction support by their type