diff --git a/android/guava-tests/test/com/google/common/math/DoubleMathTest.java b/android/guava-tests/test/com/google/common/math/DoubleMathTest.java
index 8b3742ee454f..c9c12c8194d6 100644
--- a/android/guava-tests/test/com/google/common/math/DoubleMathTest.java
+++ b/android/guava-tests/test/com/google/common/math/DoubleMathTest.java
@@ -356,13 +356,8 @@ public void testRoundLog2Half() {
       for (RoundingMode mode : asList(HALF_EVEN, HALF_UP, HALF_DOWN)) {
         double x = Math.scalb(Math.sqrt(2) + 0.001, exp);
         double y = Math.scalb(Math.sqrt(2) - 0.001, exp);
-        if (exp < 0) {
-          assertEquals(exp + 1, DoubleMath.log2(x, mode));
-          assertEquals(exp, DoubleMath.log2(y, mode));
-        } else {
-          assertEquals(exp + 1, DoubleMath.log2(x, mode));
-          assertEquals(exp, DoubleMath.log2(y, mode));
-        }
+        assertEquals(exp + 1, DoubleMath.log2(x, mode));
+        assertEquals(exp, DoubleMath.log2(y, mode));
       }
     }
   }
diff --git a/android/pom.xml b/android/pom.xml
index 7f5b28ef6f2c..ae6f9a117a1f 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -23,7 +23,7 @@
     <truth.version>1.4.4</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
     <checker.version>3.43.0</checker.version>
-    <errorprone.version>2.28.0</errorprone.version>
+    <errorprone.version>2.36.0</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <!-- Empty for all JDKs but 9-12 -->
     <maven-javadoc-plugin.additionalJOptions></maven-javadoc-plugin.additionalJOptions>
@@ -144,6 +144,7 @@
               <arg>doesnotexist</arg>
               <!-- https://errorprone.info/docs/installation#maven -->
               <arg>-XDcompilePolicy=simple</arg>
+              <arg>--should-stop=ifError=FLOW</arg>
 
               <!-- https://errorprone.info/docs/installation#maven -->
               <!-- TODO(cpovirk): Enable NullArgumentForNonNullParameter for
@@ -173,7 +174,7 @@
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.33.0</version>
+                <version>2.36.0</version>
               </path>
             </annotationProcessorPaths>
             <!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->
diff --git a/guava-tests/test/com/google/common/math/DoubleMathTest.java b/guava-tests/test/com/google/common/math/DoubleMathTest.java
index 8b3742ee454f..c9c12c8194d6 100644
--- a/guava-tests/test/com/google/common/math/DoubleMathTest.java
+++ b/guava-tests/test/com/google/common/math/DoubleMathTest.java
@@ -356,13 +356,8 @@ public void testRoundLog2Half() {
       for (RoundingMode mode : asList(HALF_EVEN, HALF_UP, HALF_DOWN)) {
         double x = Math.scalb(Math.sqrt(2) + 0.001, exp);
         double y = Math.scalb(Math.sqrt(2) - 0.001, exp);
-        if (exp < 0) {
-          assertEquals(exp + 1, DoubleMath.log2(x, mode));
-          assertEquals(exp, DoubleMath.log2(y, mode));
-        } else {
-          assertEquals(exp + 1, DoubleMath.log2(x, mode));
-          assertEquals(exp, DoubleMath.log2(y, mode));
-        }
+        assertEquals(exp + 1, DoubleMath.log2(x, mode));
+        assertEquals(exp, DoubleMath.log2(y, mode));
       }
     }
   }
diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts
index f2830db76f36..94f74f77831e 100644
--- a/integration-tests/gradle/build.gradle.kts
+++ b/integration-tests/gradle/build.gradle.kts
@@ -11,7 +11,7 @@ val expectedReducedRuntimeClasspathAndroidVersion =
     "j2objc-annotations-3.0.0.jar",
     "jsr305-3.0.2.jar",
     "checker-qual-3.43.0.jar",
-    "error_prone_annotations-2.28.0.jar",
+    "error_prone_annotations-2.36.0.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
 val expectedReducedRuntimeClasspathJreVersion =
@@ -21,7 +21,7 @@ val expectedReducedRuntimeClasspathJreVersion =
     "j2objc-annotations-3.0.0.jar",
     "jsr305-3.0.2.jar",
     "checker-qual-3.43.0.jar",
-    "error_prone_annotations-2.28.0.jar",
+    "error_prone_annotations-2.36.0.jar",
     "listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"
   )
 val expectedCompileClasspathAndroidVersion = expectedReducedRuntimeClasspathAndroidVersion
diff --git a/pom.xml b/pom.xml
index c61eb8bf645d..ab2fa84833b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <truth.version>1.4.4</truth.version>
     <jsr305.version>3.0.2</jsr305.version>
     <checker.version>3.43.0</checker.version>
-    <errorprone.version>2.28.0</errorprone.version>
+    <errorprone.version>2.36.0</errorprone.version>
     <j2objc.version>3.0.0</j2objc.version>
     <!-- Empty for all JDKs but 9-12 -->
     <maven-javadoc-plugin.additionalJOptions></maven-javadoc-plugin.additionalJOptions>
@@ -145,6 +145,7 @@
               <arg>doesnotexist</arg>
               <!-- https://errorprone.info/docs/installation#maven -->
               <arg>-XDcompilePolicy=simple</arg>
+              <arg>--should-stop=ifError=FLOW</arg>
 
               <!-- https://errorprone.info/docs/installation#maven -->
               <!-- TODO(cpovirk): Enable NullArgumentForNonNullParameter for
@@ -174,7 +175,7 @@
               <path>
                 <groupId>com.google.errorprone</groupId>
                 <artifactId>error_prone_core</artifactId>
-                <version>2.33.0</version>
+                <version>2.36.0</version>
               </path>
             </annotationProcessorPaths>
             <!-- Fork because we need args like add-exports. (But see the TODO above about .mvn/jvm.config.) -->