diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 50e349bab..1632813ea 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1238,7 +1238,8 @@ class CoursesController < ApplicationController
     end
     tip_exception("课堂所属单位不能为空！") if params[:school].blank?
     tip_exception("请至少添加一个课堂模块") if params[:course_module_types].blank?
-    @school = School.find_by!(name: params[:school].strip)
+    @school = School.find_by(name: params[:school].strip)
+    tip_exception("所属单位不存在") unless @school.present?
   end
 
   def validate_start_end_date