diff --git a/src/date2words.py b/src/date2words.py
index 055e5f6b4d2af51755c1aafcb4e20bce137ffcd2..068f2d78fc8678ee8f4890d9df8fe6b55a0fae3d 100644
--- a/src/date2words.py
+++ b/src/date2words.py
@@ -99,7 +99,7 @@ def date2words(date_match, tags=None):
             date_order = [day, *check_none(date_match['punct5']),
                           month, *check_none(date_match['punct6'])]
         else:
-            date_order = [month]
+            date_order = [month, *check_none(date_match['punct6'])]
         if year:
             date_order = date_order + [year]
         date_order = list(map(lambda x: x if x else '', date_order))
diff --git a/src/wordifier.py b/src/wordifier.py
index 0f4ed21312c13c03bfaf7c186221b427598e9ddd..cdb84625781818d2c5e9b9bf832aeeca3f1203b3 100644
--- a/src/wordifier.py
+++ b/src/wordifier.py
@@ -118,8 +118,9 @@ class Wordifier:
                 tags.append(tag)
                 tok_id += 2
             elif elem.tag == 'ns':
-                tok_id -= 1
-                string_builder.pop()
+                if string_builder:
+                    string_builder.pop()
+                    tok_id -= 1
             else:
                 raise Exception('Unrecognized tag inside sentence: ' + elem.tag)
         return self._process_sentence(string_builder, tags)