6 files changed, 15 insertions, 6 deletions
diff --git a/contrib/python/ydb/py3/.dist-info/METADATA b/contrib/python/ydb/py3/.dist-info/METADATA
index aa17898a66..1e16ba3e8d 100644
--- a/contrib/python/ydb/py3/.dist-info/METADATA
+++ b/contrib/python/ydb/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ydb
-Version: 3.18.16
+Version: 3.18.17
 Summary: YDB Python SDK
 Home-page: http://github.com/ydb-platform/ydb-python-sdk
 Author: Yandex LLC
diff --git a/contrib/python/ydb/py3/ya.make b/contrib/python/ydb/py3/ya.make
index 8b10140b34..d1d4c78a20 100644
--- a/contrib/python/ydb/py3/ya.make
+++ b/contrib/python/ydb/py3/ya.make
@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(3.18.16)
+VERSION(3.18.17)
 
 LICENSE(Apache-2.0)
 
diff --git a/contrib/python/ydb/py3/ydb/_utilities.py b/contrib/python/ydb/py3/ydb/_utilities.py
index 117c7407f2..8496dbd9e4 100644
--- a/contrib/python/ydb/py3/ydb/_utilities.py
+++ b/contrib/python/ydb/py3/ydb/_utilities.py
@@ -161,7 +161,10 @@ class SyncResponseIterator(object):
         return self
 
     def _next(self):
-        return self.wrapper(next(self.it))
+        res = self.wrapper(next(self.it))
+        if res is not None:
+            return res
+        return self._next()
 
     def next(self):
         return self._next()
diff --git a/contrib/python/ydb/py3/ydb/aio/_utilities.py b/contrib/python/ydb/py3/ydb/aio/_utilities.py
index 5bd0f1a047..296cd256f1 100644
--- a/contrib/python/ydb/py3/ydb/aio/_utilities.py
+++ b/contrib/python/ydb/py3/ydb/aio/_utilities.py
@@ -17,7 +17,10 @@ class AsyncResponseIterator(object):
         return self
 
     async def _next(self):
-        return self.wrapper(await self.it.__anext__())
+        res = self.wrapper(await self.it.__anext__())
+        if res is not None:
+            return res
+        return await self._next()
 
     async def next(self):
         return await self._next()
diff --git a/contrib/python/ydb/py3/ydb/query/base.py b/contrib/python/ydb/py3/ydb/query/base.py
index 9372cbcf54..57a769bb1a 100644
--- a/contrib/python/ydb/py3/ydb/query/base.py
+++ b/contrib/python/ydb/py3/ydb/query/base.py
@@ -192,4 +192,7 @@ def wrap_execute_query_response(
     elif tx and response_pb.tx_meta and not tx.tx_id:
         tx._move_to_beginned(response_pb.tx_meta.id)
 
-    return convert.ResultSet.from_message(response_pb.result_set, settings)
+    if response_pb.HasField("result_set"):
+        return convert.ResultSet.from_message(response_pb.result_set, settings)
+
+    return None
diff --git a/contrib/python/ydb/py3/ydb/ydb_version.py b/contrib/python/ydb/py3/ydb/ydb_version.py
index 750aee1df8..416d33e177 100644
--- a/contrib/python/ydb/py3/ydb/ydb_version.py
+++ b/contrib/python/ydb/py3/ydb/ydb_version.py
@@ -1 +1 @@
-VERSION = "3.18.16"
+VERSION = "3.18.17"