diff --git a/py_questdb/__init__.py b/py_questdb/__init__.py
index e69de29..96e61b2 100644
--- a/py_questdb/__init__.py
+++ b/py_questdb/__init__.py
@@ -0,0 +1,3 @@
+from py_questdb.db import QuestDB
+
+__all__ = ['QuestDB']
\ No newline at end of file
diff --git a/py_questdb/db.py b/py_questdb/db.py
index 239cd19..465af65 100644
--- a/py_questdb/db.py
+++ b/py_questdb/db.py
@@ -142,7 +142,9 @@ def parse_and_yield_query_response(
 
         for row in response.dataset:
             converted_row = {
-                field.name: converter(value) for field, converter, value in zip(response.columns, type_converter, row)
+                field.name: converter(value) if value is not None else None
+                for field, converter, value
+                in zip(response.columns, type_converter, row)
             }
 
             yield into_type(**converted_row) if into_type else converted_row