diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index cdb87b61d141b95d6dfae563e6278f876d587d41..0cc065395af11ed30ee66b04a72a5c9f6075397a 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -1772,6 +1772,8 @@ public class CouchDBDao implements IDatabaseDao {
 					answerDoc.put("timestamp", a.getTimestamp());
 					answerDoc.put("piRound", a.getPiRound());
 					answerDoc.put("abstention", a.isAbstention());
+					// we do not store the user's name
+					answerDoc.put("user", "");
 					answers.add(answerDoc);
 				}
 			}
diff --git a/src/main/java/de/thm/arsnova/domain/CourseScore.java b/src/main/java/de/thm/arsnova/domain/CourseScore.java
index fa3c9d92ec565bb578032076a7412e3d84759e3d..f57e5629d4de93fb69c1ffb319c068f7afd0f809 100644
--- a/src/main/java/de/thm/arsnova/domain/CourseScore.java
+++ b/src/main/java/de/thm/arsnova/domain/CourseScore.java
@@ -35,6 +35,7 @@ public class CourseScore implements Iterable<QuestionScore> {
 
 	/**
 	 * @pre questionId has been added before.
+	 * @pre username is set
 	 * @param questionId
 	 * @param username
 	 * @param userscore
@@ -45,6 +46,10 @@ public class CourseScore implements Iterable<QuestionScore> {
 			// Most likely this is a question that has no learning progress value.
 			return;
 		}
+		if (username == null || username.isEmpty()) {
+			// Precondition failed: ignore anonymous users
+			return;
+		}
 		QuestionScore questionScore = scores.get(questionId);
 		questionScore.add(username, userscore);
 	}