diff --git a/app/views/dmsf/_dir.html.erb b/app/views/dmsf/_dir.html.erb
index d4139aae..7285a11e 100644
--- a/app/views/dmsf/_dir.html.erb
+++ b/app/views/dmsf/_dir.html.erb
@@ -80,7 +80,7 @@
 <% cfs.each do |c| %>
     <% if DmsfFolder.is_column_on?(c.name) %>
         <td class="dmsf_cf">
-          <%= subfolder.custom_value(c) %>
+          <%= subfolder.custom_value(c) if subfolder %>
         </td>
     <% end %>
 <% end %>