diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
index df198f1f0..2b99fd0a9 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/GqlQuery.java
@@ -449,7 +449,7 @@ public Map<String, Object> getNamedBindings() {
     for (Map.Entry<String, Binding> binding : namedBindings.entrySet()) {
       builder.put(binding.getKey(), binding.getValue().getCursorOrValue());
     }
-    return builder.build();
+    return builder.buildOrThrow();
   }
 
   /** Returns an immutable list of positional bindings (using original order). */
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
index 5e8c092fc..69fe58513 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ReadOption.java
@@ -62,6 +62,6 @@ static Map<Class<? extends ReadOption>, ReadOption> asImmutableMap(ReadOption...
     for (ReadOption option : options) {
       builder.put(option.getClass(), option);
     }
-    return builder.build();
+    return builder.buildOrThrow();
   }
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
index 72bacca69..13e3c7af6 100644
--- a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
+++ b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/ValueType.java
@@ -76,7 +76,7 @@ public enum ValueType {
         builder.put(fieldId, valueType);
       }
     }
-    DESCRIPTOR_TO_TYPE_MAP = builder.build();
+    DESCRIPTOR_TO_TYPE_MAP = builder.buildOrThrow();
   }
 
   <V, P extends Value<V>, B extends ValueBuilder<V, P, B>> ValueType(
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
index 365fcae72..8d53dc736 100644
--- a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
+++ b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/ValueTest.java
@@ -58,7 +58,7 @@ public class ValueTest {
           .put(ValueType.RAW_VALUE, new Object[] {RawValue.class, RAW_VALUE.get()})
           .put(ValueType.LAT_LNG, new Object[] {LatLngValue.class, LAT_LNG_VALUE.get()})
           .put(ValueType.STRING, new Object[] {StringValue.class, STRING_VALUE.get()})
-          .build();
+          .buildOrThrow();
 
   private ImmutableMap<ValueType, Value<?>> typeToValue;
 
@@ -110,7 +110,7 @@ public void setUp() throws Exception {
         assertTrue("Could not find an of method for " + valueClass, found);
       }
     }
-    typeToValue = builder.build();
+    typeToValue = builder.buildOrThrow();
   }
 
   @Test