diff --git a/tasks/afc_undated.py b/tasks/afc_undated.py
index 91eb3ed..7b9115f 100644
--- a/tasks/afc_undated.py
+++ b/tasks/afc_undated.py
@@ -99,12 +99,12 @@ class AFCUndated(Task):
         elif is_talk:
             aliases = self.aliases["talk"]
             timestamp, reviewer = self.get_talkdata(page)
+            if not timestamp:
+                return
         else:
             msg = u"[[{0}]] is undated, but in a namespace I don't know how to process"
             self.logger.warn(msg.format(page.title))
             return
-        if not timestamp:
-            return
 
         code = mwparserfromhell.parse(page.get())
         changes = 0
@@ -119,6 +119,8 @@ class AFCUndated(Task):
                     else:
                         timestamp = self.get_timestamp(page, status)
                         timestamps[status] = timestamp
+                    if not timestamp:
+                        continue
                 template.add("ts", timestamp)
                 if is_talk and not has_reviewer:
                     template.add("reviewer", reviewer)