diff --git a/tools/archiver.py b/tools/archiver.py
index 36b9227..d8efc5f 100644
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -232,7 +232,8 @@
         """
 
         ojson = None
-
+        if not lid:
+            lid= msg.get('list-id')
         if self.cropout:
             crops = self.cropout.split(" ")
             # Regex replace?
@@ -270,7 +271,8 @@
             mdate = email.utils.parsedate_tz(msg_metadata.get('archived-at'))
         elif not mdate:
             print("Date seems totally wrong, setting to _now_ instead.")
-            mdate = time.gmtime()
+            mdate = time.gmtime() # Get a standard 9-tuple
+            mdate = mdate + (0, ) # Fake a TZ (10th element)
         mdatestring = time.strftime("%Y/%m/%d %H:%M:%S", time.gmtime(email.utils.mktime_tz(mdate)))
         body = self.msgbody(msg)
         try: