diff --git a/common/djangoapps/course_modes/models.py b/common/djangoapps/course_modes/models.py
index b7c437253c..deaf47510c 100644
--- a/common/djangoapps/course_modes/models.py
+++ b/common/djangoapps/course_modes/models.py
@@ -191,6 +191,13 @@ class CourseMode(models.Model):
         unique_together = ('course', 'mode_slug', 'currency')
 
     def __init__(self, *args, **kwargs):
+        if 'course_id' in kwargs:
+            course_id = kwargs['course_id']
+            if isinstance(course_id, str):
+                kwargs['course_id'] = CourseKey.from_string(course_id)
+                call_location = "\n".join("%30s : %s:%d" % (t[3], t[1], t[2]) for t in inspect.stack()[::-1])
+                log.warning("Forced to coerce course_id in CourseMode instantiation: %s", call_location)
+
         super(CourseMode, self).__init__(*args, **kwargs)
 
     def clean(self):
diff --git a/common/djangoapps/student/models.py b/common/djangoapps/student/models.py
index 172e3243a2..1892538e67 100644
--- a/common/djangoapps/student/models.py
+++ b/common/djangoapps/student/models.py
@@ -1124,6 +1124,13 @@ class CourseEnrollment(models.Model):
         ordering = ('user', 'course')
 
     def __init__(self, *args, **kwargs):
+        if 'course_id' in kwargs:
+            course_id = kwargs['course_id']
+            if isinstance(course_id, str):
+                kwargs['course_id'] = CourseKey.from_string(course_id)
+                call_location = "\n".join("%30s : %s:%d" % (t[3], t[1], t[2]) for t in inspect.stack()[::-1])
+                log.warning("Forced to coerce course_id in CourseEnrollment instantiation: %s", call_location)
+
         super(CourseEnrollment, self).__init__(*args, **kwargs)
 
         # Private variable for storing course_overview to minimize calls to the database.