diff --git a/WORKSPACE b/WORKSPACE
index 585b0fd..0c55d21 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -38,6 +38,12 @@
 register_toolchains("//tools:error_prone_warnings_toolchain_java17_definition")
 
 maven_jar(
+    name = "error-prone-annotations",
+    artifact = "com.google.errorprone:error_prone_annotations:2.22.0",
+    sha1 = "bfb9e4281a4cea34f0ec85b3acd47621cfab35b4",
+)
+
+maven_jar(
     name = "commons-codec",
     artifact = "commons-codec:commons-codec:1.15",
     sha1 = "49d94806b6e3dc933dacbd8acb0fdbab8ebd1e5d",
diff --git a/java/com/google/gitiles/BUILD b/java/com/google/gitiles/BUILD
index 51c568c..58934c0 100644
--- a/java/com/google/gitiles/BUILD
+++ b/java/com/google/gitiles/BUILD
@@ -6,6 +6,7 @@
     "//lib:autolink",
     "//lib:commons-lang3",
     "//lib:commons-text",
+    "//lib:errorprone-annotations",
     "//lib:gson",
     "//lib:guava",
     "//lib:html-types",
diff --git a/java/com/google/gitiles/GitilesRequestFailureException.java b/java/com/google/gitiles/GitilesRequestFailureException.java
index dd990a8..c4fd48a 100644
--- a/java/com/google/gitiles/GitilesRequestFailureException.java
+++ b/java/com/google/gitiles/GitilesRequestFailureException.java
@@ -20,6 +20,8 @@
 import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
 
+import com.google.errorprone.annotations.FormatMethod;
+import com.google.errorprone.annotations.FormatString;
 import java.util.Optional;
 import javax.annotation.Nullable;
 
@@ -102,7 +104,9 @@
     this.reason = reason;
   }
 
-  public GitilesRequestFailureException withPublicErrorMessage(String format, Object... params) {
+  @FormatMethod
+  public GitilesRequestFailureException withPublicErrorMessage(
+      @FormatString String format, Object... params) {
     this.publicErrorMessage = String.format(format, params);
     return this;
   }
diff --git a/lib/BUILD b/lib/BUILD
index f6ba7ec..c763f24 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -89,3 +89,9 @@
     name = "commons-compress",
     exports = ["@commons-compress//jar"],
 )
+
+java_library(
+    name = "errorprone-annotations",
+    visibility = ["//visibility:public"],
+    exports = ["@error-prone-annotations//jar"],
+)
\ No newline at end of file