Merge 6bb7d8759d into a28b6ec81d

src/main/java/com/zaxxer/hikari/pool/ProxyStatement.java

@@ -228,8 +228,13 @@ public abstract class ProxyStatement implements Statement
    public ResultSet getGeneratedKeys() throws SQLException
    {
       var resultSet = delegate.getGeneratedKeys();
-      if (proxyResultSet == null || ((ProxyResultSet) proxyResultSet).delegate != resultSet) {
-         proxyResultSet = ProxyFactory.getProxyResultSet(connection, this, resultSet);
+      if (resultSet != null) {
+         if (proxyResultSet == null || ((ProxyResultSet) proxyResultSet).delegate != resultSet) {
+            proxyResultSet = ProxyFactory.getProxyResultSet(connection, this, resultSet);
+         }
+      }
+      else {
+         proxyResultSet = null;
       }
       return proxyResultSet;
    }