Better error handling.

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -21,7 +21,7 @@ from .xml_module import XmlDescriptor
 from xmodule.modulestore import Location
 import self_assessment_module
 import open_ended_module
-from combined_open_ended_rubric import CombinedOpenEndedRubric
+from combined_open_ended_rubric import CombinedOpenEndedRubric, RubricParsingError
 from .stringify import stringify_children
 
 log = logging.getLogger("mitx.courseware")
@@ -141,7 +141,11 @@ class CombinedOpenEndedModule(XModule):
         self._max_score = int(self.metadata.get('max_score', MAX_SCORE))
 
         rubric_renderer = CombinedOpenEndedRubric(system, True)
-        rubric_feedback = rubric_renderer.render_rubric(stringify_children(definition['rubric']))
+        try:
+            rubric_feedback = rubric_renderer.render_rubric(stringify_children(definition['rubric']))
+        except RubricParsingError:
+            log.error("Failed to parse rubric in location: {1}".format(location))
+            raise Exception("CombinedOpenEnded: could not render given rubric")
         #Static data is passed to the child modules to render
         self.static_data = {
             'max_score': self._max_score,