diff --git a/tutorials/tutorials.md b/tutorials/tutorials.md
index fd9918a..7d19ab0 100644
--- a/tutorials/tutorials.md
+++ b/tutorials/tutorials.md
@@ -5,11 +5,12 @@ permalink: /tutorials/
 ## Listing Tutorials
 
 <ul>
-{% assign tutorials = site.pages | where_exp: "p", p.path contains "tutorials/" %}
+{% assign tutorials = site.pages | where_exp: "p", "p.path and p.path contains 'tutorials/'" %}
 {% for t in tutorials %}
-  {% if t.path != "tutorials/index.md" and t.path != "tutorials/README.md" and t.path != "tutorials.md" %}
+  {% assign p = t.path | default: "" %}
+  {% if p != "tutorials/index.md" and p != "tutorials/README.md" and p != "tutorials.md" %}
     <li>
-      <a href="{{ t.url | relative_url }}">{{ t.title | default: t.path | replace: "tutorials/", "" }}</a>
+      <a href="{{ t.url | relative_url }}">{{ t.title | default: p | replace: "tutorials/", "" }}</a>
       {% if t.date %} — <time datetime="{{ t.date | date_to_xmlschema }}">{{ t.date | date: "%Y-%m-%d" }}</time>{% endif %}
     </li>
   {% endif %}