diff --git a/app/views/dmsf/_dir.html.erb b/app/views/dmsf/_dir.html.erb
index 4a136309..b11c3af7 100644
--- a/app/views/dmsf/_dir.html.erb
+++ b/app/views/dmsf/_dir.html.erb
@@ -32,7 +32,7 @@
   <%= link_to(h(title),
     dmsf_folder_path(:id => project, :folder_id => subfolder),
     :class => 'icon icon-folder',
-    :title => h(subfolder.description)) %>
+    :title => subfolder ? h(subfolder.description) : nil) %>
   <% if link %>
     <div class="dmsf_filename" title="<%= l(:label_target_folder)%>"><%= link.path %></div>
   <% else %>
diff --git a/app/views/dmsf/_dir_trash.html.erb b/app/views/dmsf/_dir_trash.html.erb
index 3a742703..bb0247e7 100644
--- a/app/views/dmsf/_dir_trash.html.erb
+++ b/app/views/dmsf/_dir_trash.html.erb
@@ -23,8 +23,8 @@
 <td class="dmsf_checkbox"><%= check_box_tag(name, id, false, 
   :title => l(:title_check_for_restore_or_delete), :id => "subfolder_#{id}") %></td>
 <td class="dmsf_title">                  
-  <%= content_tag(:span, h(title), 
-    :title => h(subfolder.description),
+  <%= content_tag(:span, h(title),
+    :title => subfolder ? h(subfolder.description) : nil,
     :class => 'icon icon-folder') %>
   <% if link %>
     <div class="dmsf_filename" title="<%= l(:label_target_folder)%>"><%= link.path %></div>