diff --git a/ponysay-tool.py b/ponysay-tool.py
index 4607609d..08c3663b 100755
--- a/ponysay-tool.py
+++ b/ponysay-tool.py
@@ -763,6 +763,8 @@ class PonysayTool():
                     keys = [key for key in data]
                     keys.sort()
                     for key in keys:
+                        if self.data[key] is None:
+                            continue
                         if (key == 'comment') or (len(self.data[key].strip()) == 0):
                             continue
                         values = self.data[key].strip()
@@ -949,6 +951,8 @@ class TextArea: # TODO support small screens
                         current = leftlines[row]
                         if len(datalines[row].strip()) == 0:
                             if current is not 'comment':
+                                if current != last:
+                                    self.datamap[current] = None
                                 continue
                         if current == last:
                             self.datamap[current] += '\n' + datalines[row]