diff --git a/common/lib/xmodule/xmodule/error_module.py b/common/lib/xmodule/xmodule/error_module.py
index 199fb0d580..4a4b55e652 100644
--- a/common/lib/xmodule/xmodule/error_module.py
+++ b/common/lib/xmodule/xmodule/error_module.py
@@ -118,7 +118,7 @@ class ErrorDescriptor(EditingDescriptor):
             # Save the error to display later--overrides other problems
             error_msg = exc_info_to_str(sys.exc_info())
 
-        return cls(system, xml_data, error_msg)
+        return cls(system, xml_data, error_msg, org=org, course=course)
 
     def export_to_xml(self, resource_fs):
         '''