diff --git a/src/handlers/entities.js b/src/handlers/entities.js
index 095dd964..cd1fc9cf 100644
--- a/src/handlers/entities.js
+++ b/src/handlers/entities.js
@@ -56,6 +56,9 @@ export default (tuples) => {
       currentEntityTuples = []
       entityGroups.push(currentEntityTuples)
     }
+    if (currentEntityTuples === undefined) {
+      return
+    }
     currentEntityTuples.push(tuple)
   })
 
diff --git a/src/handlers/tables.js b/src/handlers/tables.js
index 67a200f9..220767f8 100644
--- a/src/handlers/tables.js
+++ b/src/handlers/tables.js
@@ -280,7 +280,7 @@ const tableHandler = (tuples, tableType, handler) => {
     if ((type === 0 || type === 2) && value === tableType) {
       tableRowTuples = []
       tableRowsTuples.push(tableRowTuples)
-    } else {
+    } else if (tableRowTuples !== undefined) {
       tableRowTuples.push(tuple)
     }
   })
@@ -307,7 +307,7 @@ export default (tuples) => {
       tableGroups.push(tableTuples)
     } else if (value === 'ENDTAB') {
       tableGroups.push(tableTuples)
-    } else {
+    } else if (tableTuples !== undefined) {
       tableTuples.push(tuple)
     }
   })