diff --git a/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java b/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java
index 3e29f42665..53a7aaa02e 100644
--- a/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java
+++ b/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/PreferSafeLoggableExceptions.java
@@ -27,6 +27,7 @@
 import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.matchers.Matchers;
 import com.google.errorprone.util.ASTHelpers;
+import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.NewClassTree;
 import java.io.IOException;
@@ -98,6 +99,6 @@ public Description matchNewClass(NewClassTree tree, VisitorState state) {
                                 .build())
                         .build())
                 .findAny()
-                .orElseThrow(() -> new IllegalStateException("Expected to match a known replaceable exception type"));
+                .orElseThrow(() -> new SafeIllegalStateException("Expected to match a known replaceable exception type"));
     }
 }
diff --git a/build.gradle b/build.gradle
index 4c8c550074..f016b92659 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.2.0'
         classpath 'com.netflix.nebula:gradle-info-plugin:5.0.3'
-        classpath 'com.palantir.baseline:gradle-baseline-java:1.17.2'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.0.0'
     }
 }