diff --git a/include/sqlite3db.h b/include/sqlite3db.h
index 8ff0e1e07..b56943259 100644
--- a/include/sqlite3db.h
+++ b/include/sqlite3db.h
@@ -38,8 +38,12 @@ class SQLite3_row {
 		int i;
 		for (i=0;i<cnt;i++) {
 			sizes[i]=sqlite3_column_bytes(stmt,i);
-			const char *c=(char *)sqlite3_column_text(stmt,i);
-			fields[i]=( c ? strdup(c) : NULL);
+			if (size[i]) {
+				const char *c=(char *)sqlite3_column_text(stmt,i);
+				fields[i]=strdup(c);
+			} else {
+				fields[i]=NULL;
+			}
 			//fields[i]=(sizes[i] ? strdup((char *)sqlite3_column_text(stmt,i)) : NULL);
 		}
 	};