diff --git a/core/build.gradle b/core/build.gradle
index 8d8f488e68..756881df81 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -39,7 +39,7 @@ dependencies {
     implementation 'com.univocity:univocity-parsers:2.9.0'
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.geometry:s2-geometry:2.0.0'
-    implementation 'com.google.guava:guava:29.0-jre'
+    implementation 'com.google.guava:guava:31.0.1-jre'
     implementation 'commons-validator:commons-validator:1.6'
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.13'
     implementation 'com.google.flogger:flogger:0.6'
diff --git a/main/build.gradle b/main/build.gradle
index a5fcfb73c0..e55d08c531 100644
--- a/main/build.gradle
+++ b/main/build.gradle
@@ -80,7 +80,7 @@ dependencies {
     implementation 'com.beust:jcommander:1.48'
     implementation 'javax.inject:javax.inject:1'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'com.google.guava:guava:29.0-jre'
+    implementation 'com.google.guava:guava:31.0.1-jre'
     implementation 'com.google.flogger:flogger:0.6'
     implementation 'com.google.flogger:flogger-system-backend:0.6'
     implementation 'com.univocity:univocity-parsers:2.9.0'
diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle
index 104141af2a..1ec52c220a 100644
--- a/output-comparator/build.gradle
+++ b/output-comparator/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation project(':core')
     implementation 'commons-io:commons-io:2.8.0'
     implementation 'com.google.api-client:google-api-client:1.31.2'
-    implementation 'com.google.guava:guava:29.0-jre'
+    implementation 'com.google.guava:guava:31.0.1-jre'
     implementation 'com.google.flogger:flogger:0.5.1'
     implementation 'com.google.flogger:flogger-system-backend:0.5.1'
     implementation 'com.beust:jcommander:1.48'
diff --git a/processor/build.gradle b/processor/build.gradle
index d906822695..f1c591ef0b 100644
--- a/processor/build.gradle
+++ b/processor/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation 'javax.inject:javax.inject:1'
     implementation 'com.squareup:javapoet:1.13.0'
     implementation 'org.apache.commons:commons-lang3:3.6'
-    implementation 'com.google.guava:guava:29.0-jre'
+    implementation 'com.google.guava:guava:31.0.1-jre'
     implementation 'com.google.flogger:flogger:0.6'
     implementation 'com.univocity:univocity-parsers:2.9.0'
     implementation 'com.google.geometry:s2-geometry:2.0.0'
diff --git a/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/GtfsFileDescriptor.java b/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/GtfsFileDescriptor.java
index b0f05958ea..0faaff563e 100644
--- a/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/GtfsFileDescriptor.java
+++ b/processor/src/main/java/org/mobilitydata/gtfsvalidator/processor/GtfsFileDescriptor.java
@@ -105,7 +105,7 @@ public GtfsFileDescriptor build() {
           indicesBuilder.add(field);
         }
       }
-      ImmutableMap<String, GtfsFieldDescriptor> fieldsMap = fieldsMapBuilder.build();
+      ImmutableMap<String, GtfsFieldDescriptor> fieldsMap = fieldsMapBuilder.buildOrThrow();
       ImmutableList.Builder<LatLonDescriptor> latLonBuilder = ImmutableList.builder();
       for (GtfsFieldDescriptor field : fields()) {
         if (!field.type().equals(FieldTypeEnum.LATITUDE)) {