diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb
index 03472d0a0..aaf21999d 100644
--- a/app/views/admin/homework.html.erb
+++ b/app/views/admin/homework.html.erb
@@ -38,11 +38,13 @@
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.name%>'>
               <%=link_to(homework.try(:name), student_work_index_path(:homework => homework.id))%>
             </td>
-            <% if homework.course %>
-            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.course.name%>'>
-              <%= link_to(homework.course.name, course_path(homework.course.id)) %>
+
+            <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%= homework.course.nil? ? "" : homework.course.name %>'>
+              <% if homework.course %>
+                <%= link_to homework.course.name, course_path(homework.course.id) %>
+              <% end %>
             </td>
-            <% end %>
+
             <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if homework.try(:user).try(:realname) == ' '%><%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'>
               <% if homework.try(:user).try(:realname) == ' '%>
                   <%= link_to(homework.try(:user), user_path(homework.user_id)) %>