Clean up InstructorCourseEditPageAction
Change type of exception
Merge branch 'master' into Issue1846
[1846] Clean up InstructorCourseEditPageAction

fixes #1846