diff --git a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/SegmentMetadataUtils.java b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/SegmentMetadataUtils.java
index b78d47637e2..66588955372 100644
--- a/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/SegmentMetadataUtils.java
+++ b/pinot-segment-spi/src/main/java/org/apache/pinot/segment/spi/utils/SegmentMetadataUtils.java
@@ -50,7 +50,7 @@ public static PropertiesConfiguration getPropertiesConfiguration(SegmentMetadata
 
   public static void savePropertiesConfiguration(PropertiesConfiguration propertiesConfiguration, File indexDir) {
     File metadataFile = SegmentDirectoryPaths.findMetadataFile(indexDir);
-    Preconditions.checkNotNull(metadataFile, "Cannot find segment metadata file under directory: %s", indexDir);
+    Preconditions.checkState(metadataFile != null, "Cannot find segment metadata file under directory: %s", indexDir);
     CommonsConfigurationUtils.saveToFile(propertiesConfiguration, metadataFile);
   }
 
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java b/pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
index 934c1699766..ae79fe9d90f 100644
--- a/pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
+++ b/pinot-spi/src/main/java/org/apache/pinot/spi/env/CommonsConfigurationUtils.java
@@ -265,7 +265,7 @@ private static PropertiesConfiguration createPropertiesConfiguration(boolean set
 
     // setting DEFAULT_LIST_DELIMITER
     if (setDefaultDelimiter) {
-      CommonsConfigurationUtils.setListDelimiterHandler(config);
+      setListDelimiterHandler(config);
     }
 
     return config;