diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java
index 9eb349ca12..be4c9e7b11 100644
--- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java
+++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/AbstractJdbcDdlReader.java
@@ -1217,22 +1217,25 @@ protected void determineAutoIncrementFromResultSetMetaData(Connection conn, Tabl
                             "Running the following query to get metadata about whether a column is an auto increment column: \n{}",
                             query);
                 }
-                ResultSet rs = stmt.executeQuery(query.toString());
-                ResultSetMetaData rsMetaData = rs.getMetaData();
+                ResultSet rs = null;
+                try {
+                    rs = stmt.executeQuery(query.toString());
+                    ResultSetMetaData rsMetaData = rs.getMetaData();
 
-                for (int idx = 0; idx < columnsToCheck.length; idx++) {
-                    if (log.isDebugEnabled()) {
-                        log.debug(columnsToCheck[idx] + " is auto increment? "
-                                + rsMetaData.isAutoIncrement(idx + 1));
-                    }
-                    if (rsMetaData.isAutoIncrement(idx + 1)) {
-                        columnsToCheck[idx].setAutoIncrement(true);
+                    for (int idx = 0; idx < columnsToCheck.length; idx++) {
+                        if (log.isDebugEnabled()) {
+                            log.debug(columnsToCheck[idx] + " is auto increment? "
+                                    + rsMetaData.isAutoIncrement(idx + 1));
+                        }
+                        if (rsMetaData.isAutoIncrement(idx + 1)) {
+                            columnsToCheck[idx].setAutoIncrement(true);
+                        }
                     }
+                } finally {
+                    close(rs);
                 }
             } finally {
-                if (stmt != null) {
-                    stmt.close();
-                }
+                close(stmt);
             }
         } catch (SQLException ex) {
             StringBuilder msg = new StringBuilder(
@@ -1339,7 +1342,7 @@ public List<String> execute(Connection connection) throws SQLException {
                     }
                     return schemas;
                 } finally {
-                    JdbcSqlTemplate.close(rs);
+                    close(rs);
                 }
             }
         });
@@ -1361,7 +1364,7 @@ public List<String> execute(Connection connection) throws SQLException {
                     }
                     return list;
                 } finally {
-                    JdbcSqlTemplate.close(rs);
+                    close(rs);
                 }
             }
         });
@@ -1382,7 +1385,7 @@ public List<String> execute(Connection connection) throws SQLException {
                     }
                     return list;
                 } finally {
-                    JdbcSqlTemplate.close(rs);
+                    close(rs);
                 }
             }
         });