diff --git a/build-logic/src/main/kotlin/polaris-java.gradle.kts b/build-logic/src/main/kotlin/polaris-java.gradle.kts
index 4a91766fa..d0462212a 100644
--- a/build-logic/src/main/kotlin/polaris-java.gradle.kts
+++ b/build-logic/src/main/kotlin/polaris-java.gradle.kts
@@ -36,7 +36,10 @@ tasks.withType(JavaCompile::class.java).configureEach {
   options.errorprone.disableWarningsInGeneratedCode = true
   options.errorprone.error(
     "DefaultCharset",
+    "FallThrough",
+    "MissingCasesInEnumSwitch",
     "MissingOverride",
+    "OrphanedFormatString",
     "StringCaseLocaleUsage",
   )
 }
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java
index 8d8d1e969..2f79ed4d7 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java
@@ -1587,6 +1587,8 @@ private void renameTableLike(
               throw new AlreadyExistsException(
                   "Cannot rename %s to %s. View already exists", from, to);
             }
+            throw new IllegalStateException(
+                String.format("Unexpected entity type '%s'", existingEntitySubType));
           }
 
         case PolarisMetaStoreManager.ReturnStatus.ENTITY_NOT_FOUND: