diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index cca02c85..9788c6ea 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -43,9 +43,7 @@
     {{ $title = $pagetitle }}
 {{ else if $sitetitle }}
     {{ $title = $sitetitle }}
-{{ end }}
-
-{{ if not $title }}
+{{ else }}
     {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a title" $page.RelPermalink }}
 {{ end }}
 
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 588c3236..6a0c4534 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -36,6 +36,8 @@
     {{ $title = $pagetitle }}
 {{ else if $sitetitle }}
     {{ $title = $sitetitle }}
+{{ else }}
+    {{ warnf "layouts/_default/rss.xml: Page %s does not have a title" $page.RelPermalink }}
 {{ end }}
 
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\"?>" | safeHTML }}