diff --git a/src/main/java/de/thm/arsnova/FeedbackStorage.java b/src/main/java/de/thm/arsnova/FeedbackStorage.java
index e6ec8854ca01d43780134e552394c832eece230a..afa717dd476c3fc58808c218e15ba01f9414d9eb 100644
--- a/src/main/java/de/thm/arsnova/FeedbackStorage.java
+++ b/src/main/java/de/thm/arsnova/FeedbackStorage.java
@@ -137,13 +137,15 @@ public class FeedbackStorage {
 		final Map<User, FeedbackStorageObject> sessionFeedbacks = data.get(session);
 		final List<User> affectedUsers = new ArrayList<User>();
 
-		for (final Map.Entry<User, FeedbackStorageObject> entry : sessionFeedbacks.entrySet()) {
-			final User user = entry.getKey();
-			final FeedbackStorageObject feedback = entry.getValue();
-			final boolean timeIsUp = feedback.getTimestamp().before(maxAllowedTime);
-			if (timeIsUp) {
-				sessionFeedbacks.remove(user);
-				affectedUsers.add(user);
+		if (sessionFeedbacks != null) {
+			for (final Map.Entry<User, FeedbackStorageObject> entry : sessionFeedbacks.entrySet()) {
+				final User user = entry.getKey();
+				final FeedbackStorageObject feedback = entry.getValue();
+				final boolean timeIsUp = feedback.getTimestamp().before(maxAllowedTime);
+				if (timeIsUp) {
+					sessionFeedbacks.remove(user);
+					affectedUsers.add(user);
+				}
 			}
 		}
 		return affectedUsers;