diff --git a/langchain4j-oracle/src/main/java/dev/langchain4j/store/embedding/oracle/SQLFilters.java b/langchain4j-oracle/src/main/java/dev/langchain4j/store/embedding/oracle/SQLFilters.java
index 535f1fd2ed9..63fc8e96d2e 100644
--- a/langchain4j-oracle/src/main/java/dev/langchain4j/store/embedding/oracle/SQLFilters.java
+++ b/langchain4j-oracle/src/main/java/dev/langchain4j/store/embedding/oracle/SQLFilters.java
@@ -90,7 +90,7 @@ private SQLFilters() {}
      *
      * @return The equivalent SQLFilter, which may be {@link #EMPTY} if the input <code>Filter</code> is null.
      *
-     * @throws IllegalArgumentException If the class of the Filter is not recognized.
+     * @throws UnsupportedOperationException If the class of the Filter is not recognized.
      */
     static SQLFilter create(Filter filter, BiFunction<String, OracleType, String> keyMapper) {
         if (filter == null) return EMPTY;
@@ -98,7 +98,8 @@ static SQLFilter create(Filter filter, BiFunction<String, OracleType, String> ke
         Class<? extends Filter> filterClass = filter.getClass();
         FilterConstructor constructor = CONSTRUCTORS.get(filterClass);
 
-        if (constructor == null) throw new IllegalArgumentException("Unrecognized Filter class: " + filterClass);
+        if (constructor == null)
+            throw new UnsupportedOperationException("Unsupported filter type: " + filterClass.getName());
 
         return constructor.construct(filter, keyMapper);
     }
diff --git a/langchain4j-oracle/src/test/java/dev/langchain4j/store/embedding/oracle/OracleEmbeddingStoreWithRemovalIT.java b/langchain4j-oracle/src/test/java/dev/langchain4j/store/embedding/oracle/OracleEmbeddingStoreWithRemovalIT.java
index 1f8f9606851..f5a8de6bd9f 100644
--- a/langchain4j-oracle/src/test/java/dev/langchain4j/store/embedding/oracle/OracleEmbeddingStoreWithRemovalIT.java
+++ b/langchain4j-oracle/src/test/java/dev/langchain4j/store/embedding/oracle/OracleEmbeddingStoreWithRemovalIT.java
@@ -10,7 +10,7 @@
 
 public class OracleEmbeddingStoreWithRemovalIT extends EmbeddingStoreWithRemovalIT {
 
-    private static final OracleEmbeddingStore EMBEDDING_STORE = CommonTestOperations.newEmbeddingStore();
+    private final OracleEmbeddingStore embeddingStore = CommonTestOperations.newEmbeddingStore();
 
     @BeforeEach
     public void clearTable() {
@@ -21,7 +21,7 @@ public void clearTable() {
 
     @Override
     protected EmbeddingStore<TextSegment> embeddingStore() {
-        return EMBEDDING_STORE;
+        return embeddingStore;
     }
 
     @Override
diff --git a/langchain4j-oracle/src/test/java/dev/langchain4j/store/embedding/oracle/VectorIndexIT.java b/langchain4j-oracle/src/test/java/dev/langchain4j/store/embedding/oracle/VectorIndexIT.java
index fbf586e25ab..cc159f1f7e7 100644
--- a/langchain4j-oracle/src/test/java/dev/langchain4j/store/embedding/oracle/VectorIndexIT.java
+++ b/langchain4j-oracle/src/test/java/dev/langchain4j/store/embedding/oracle/VectorIndexIT.java
@@ -262,7 +262,7 @@ private void verifyIndexExists(CreateOption createOption, String tableName, Stri
             throws SQLException {
         try (Connection connection = getDataSource().getConnection();
                 PreparedStatement preparedStatement = connection.prepareStatement(
-                        "SELECT 'OK' FROM user_indexes WHERE table_name=? AND index_name=? AND index_type?")) {
+                        "SELECT 'OK' FROM user_indexes WHERE table_name=? AND index_name=? AND index_type=?")) {
             preparedStatement.setString(1, tableName);
             preparedStatement.setString(2, indexName);
             preparedStatement.setString(3, indexType);