diff --git a/public/_layout.ejs b/public/_layout.ejs
index 4ad9b56..b47c64b 100644
--- a/public/_layout.ejs
+++ b/public/_layout.ejs
@@ -98,7 +98,7 @@
     <div class="clearfix"></div>
   </header>
 
-  <% if (typeof link != 'undefined') { -%>
+  <% if (typeof link != 'undefined' && link !== null) { -%>
     <article class="container">
       <header>
         <h2><a href="<%= link %>">&rarr; <%= title %></a></h2>
@@ -110,7 +110,7 @@
     <div class="row clearfix">
       <p class="fin clearfix"><i class="fa fa-code"></i></p>
     </div>
-  <% } else if (typeof date != 'undefined') { -%>
+  <% } else if (typeof date != 'undefined' && date !== null) { -%>
     <article class="container">
       <header>
         <h2><a href="<%= url %>"><%= title %></a></h2>
@@ -121,7 +121,7 @@
     <div class="row clearfix">
       <p class="fin"><i class="fa fa-code"></i></p>
     </div>
-  <% } else if (typeof title != 'undefined') { -%>
+  <% } else if (typeof title != 'undefined' && title !== null) { -%>
     <article class="container">
       <h2><%= title %></h2>
       <%- yield %>