diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 2ed6a2a52..f532eeadd 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -880,10 +880,10 @@ class Enumeration:
             if value:
                 table = {}
                 columns = {}
-                
+
                 if kb.dbms == "SQLite":
                     for match in re.finditer(getCompiledRegex(r"(\w+) ([A-Z]+)[,\r\n]"), value):
-                        columns[match.group(1)] = match.group(2)
+                        columns[match.group(1)] = match.group(2)
                 else:
                     for column, colType in value:
                         columns[column] = colType
@@ -1061,10 +1061,13 @@ class Enumeration:
                         kb.data.dumpedTable[column] = { "length": 0, "values": [] }
 
                     for entry in entries:
+                        if entry is None or len(entry) == 0:
+                            continue
+
                         if isinstance(entry, basestring):
                             colEntry = entry
                         else:
-                            colEntry = entry[index]
+                            colEntry = entry[index] if index < len(entry) else u''
 
                         colEntryLen = len(getUnicode(colEntry))
                         maxLen = max(colLen, colEntryLen)