diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb
index 7260d68ff..331806293 100644
--- a/app/views/admin/homework.html.erb
+++ b/app/views/admin/homework.html.erb
@@ -29,6 +29,7 @@
     <tbody>
       <%@count=@page*30 %>
       <% for homework in @homework do %>
+          <% unless homework.nil? %>
           <% @count+=1 %>
           <tr>
             <td align="center">
@@ -54,6 +55,7 @@
               <%=format_date(homework.end_time) %>
             </td>
           </tr>
+          <% end %>
       <% end %>
     </tbody>
   </table>