diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb
index 09f42bb84..a3a64b316 100644
--- a/app/views/admin/homework.html.erb
+++ b/app/views/admin/homework.html.erb
@@ -37,9 +37,11 @@
             <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>
+            <% 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)) %>
diff --git a/app/views/admin/organization.html.erb b/app/views/admin/organization.html.erb
index 02b897f80..6fde09ede 100644
--- a/app/views/admin/organization.html.erb
+++ b/app/views/admin/organization.html.erb
@@ -24,7 +24,8 @@
         <tr class="<%= cycle("odd", "even") %>">
           <td style="text-align:center;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=org.name%>'>
             <span>
-              <%= link_to org.name,home_path(:organization => org.id) %>
+              <%#= link_to org.name,home_path(:organization => org.id) %>
+              <%= link_to org.name, organization_path(org) %>
             </span>
           </td>
           <td align="center">