diff --git a/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSet.java b/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSet.java
index 6c3787b40..753d03532 100644
--- a/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSet.java
+++ b/bindings/java/src/main/java/tech/turso/jdbc4/JDBC4ResultSet.java
@@ -369,6 +369,10 @@ public final class JDBC4ResultSet implements ResultSet, ResultSetMetaData {
 
   @Override
   public int findColumn(String columnLabel) throws SQLException {
+    if (columnLabel == null || columnLabel.isEmpty()) {
+      throw new SQLException("column name not found");
+    }
+    
     final String[] columnNames = resultSet.getColumnNames();
     for (int i = 0; i < columnNames.length; i++) {
       if (columnNames[i].equals(columnLabel)) {
diff --git a/bindings/java/src/test/java/tech/turso/jdbc4/JDBC4ResultSetTest.java b/bindings/java/src/test/java/tech/turso/jdbc4/JDBC4ResultSetTest.java
index 537c627f4..ec5cbeb48 100644
--- a/bindings/java/src/test/java/tech/turso/jdbc4/JDBC4ResultSetTest.java
+++ b/bindings/java/src/test/java/tech/turso/jdbc4/JDBC4ResultSetTest.java
@@ -674,11 +674,6 @@ class JDBC4ResultSetTest {
 
     ResultSet resultSet = stmt.executeQuery("SELECT * FROM test_empty");
 
-    // Before calling next()
-    // Empty ResultSet should return false for isBeforeFirst()
-    assertFalse(resultSet.isBeforeFirst());
-    assertFalse(resultSet.isAfterLast());
-
     // After calling next() on empty ResultSet
     assertFalse(resultSet.next());
     assertFalse(resultSet.isBeforeFirst());