diff --git a/common/lib/xmodule/xmodule/foldit_module.py b/common/lib/xmodule/xmodule/foldit_module.py
index 3990a61183..893a86f03f 100644
--- a/common/lib/xmodule/xmodule/foldit_module.py
+++ b/common/lib/xmodule/xmodule/foldit_module.py
@@ -96,8 +96,18 @@ class FolditModule(XModule):
             self.required_level,
             self.required_sublevel)
 
-        showbasic = (self.metadata.get("show_basic_score").lower() == "true")
-        showleader = (self.metadata.get("show_leaderboard").lower() == "true")
+        # Wrap these gets around try-except since calling lower() on NoneType
+        # (e.g. there is no attribute "show_basic_score" to the tag) will raise
+        # an exception
+        try:
+            showbasic = (self.metadata.get("show_basic_score").lower() == "true")
+        except:
+            showbasic = False
+        try:
+            showleader = (self.metadata.get("show_leaderboard").lower() == "true")
+        except:
+            showleader = False
+
         context = {
             'due': self.due_str,
             'success': self.is_complete(),
diff --git a/lms/djangoapps/foldit/views.py b/lms/djangoapps/foldit/views.py
index 988c113d23..da361a2a82 100644
--- a/lms/djangoapps/foldit/views.py
+++ b/lms/djangoapps/foldit/views.py
@@ -130,7 +130,7 @@ def save_scores(user, puzzle_scores):
                 current_score=current_score,
                 best_score=best_score,
                 score_version=score_version)
-            obj.save()
+        obj.save()
 
         score_responses.append({'PuzzleID': puzzle_id,
                                 'Status': 'Success'})