Split/add and fixes

This is in the method for rerunning a course, which happens only in a separate celery thread.
But the UI code needs to handle this error case, so we explicitly check here as well.