diff --git a/atlas/views.py b/atlas/views.py
index 2e925204..74c446d6 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1442,7 +1442,7 @@ def collection_scores_cid(request, pk):
         ans = s.answer
 
         answer_score = s.get_answer_score()
-        if answer_score == "unmarked":
+        if answer_score == "unmarked" or answer_score == None:
             index = cases.index(q)
             unmarked.add(index)
         user_answers[cid].append(ans)
@@ -1456,7 +1456,7 @@ def collection_scores_cid(request, pk):
     for user in user_answers_marks:
 
         user_scores[user] = sum(
-            [i for i in user_answers_marks[user] if i != "unmarked"]
+            [i for i in user_answers_marks[user] if (i != "unmarked" and i != None)]
         )
 
         user_scores_normalised[user] = user_scores[user]