enhance course/create and course/update robustness