diff --git a/lib/nntp/tiny/db.py b/lib/nntp/tiny/db.py
index f747595..1593570 100644
--- a/lib/nntp/tiny/db.py
+++ b/lib/nntp/tiny/db.py
@@ -31,7 +31,9 @@ class DatabaseTableCursor():
         return obj
 
     def fetchone(self):
-        return self.__map__(self.cr.fetchone())
+        row = self.cr.fetchone()
+
+        return self.__map__(row) if row is not None else None
 
     def fetchall(self):
         return map(self.__map__, self.cr.fetchall())