diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 1ea109ff1..81e4d7bfb 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -41,7 +41,12 @@ class OrganizationsController < ApplicationController
   end
 
   def edit
-    @organization = Organization.find(params[:id])
+    # @organization = Organization.find(params[:id])
+    begin
+    @organization = Organization.where("id =?", params[:id])
+    ensure
+      render_404
+    end
   end
 
   def destroy
diff --git a/app/views/admin/homework.html.erb b/app/views/admin/homework.html.erb
index 7260d68ff..e21307485 100644
--- a/app/views/admin/homework.html.erb
+++ b/app/views/admin/homework.html.erb
@@ -35,7 +35,7 @@
               <%=@count %>
             </td>
             <td style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<%=homework.name%>'>
-              <%=link_to(homework.name, student_work_index_path(:homework => homework.id))%>
+              <%=link_to(homework.try(:name), student_work_index_path(:homework => homework.id))%>
             </td>
             <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)) %>