diff --git a/pom.xml b/pom.xml
index 4bf70cd8..9c22609f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
     <auto-common.version>1.2.2</auto-common.version>
     <java.version>1.8</java.version>
     <guava.version>33.3.1-jre</guava.version>
-    <errorprone.version>2.35.1</errorprone.version>
+    <errorprone.version>2.36.0</errorprone.version>
   </properties>
 
   <dependencyManagement>
@@ -297,6 +297,7 @@
               <compilerArgs>
                 <!-- https://errorprone.info/docs/installation#maven -->
                 <arg>-XDcompilePolicy=simple</arg>
+                <arg>--should-stop=ifError=FLOW</arg>
                 <!-- TODO(cpovirk): Use .mvn/jvm.config instead (per
                      https://errorprone.info/docs/installation#maven) if it can
                      be made not to interfere with JDK8 or if we stop building