diff --git a/src/main/java/de/thm/arsnova/services/QuestionService.java b/src/main/java/de/thm/arsnova/services/QuestionService.java
index 0b2b62e08cbaf0308d75e3c9ab9342a4aa486d3b..ffd40cbe261a455c77823ccf1a44bb08f46c670c 100644
--- a/src/main/java/de/thm/arsnova/services/QuestionService.java
+++ b/src/main/java/de/thm/arsnova/services/QuestionService.java
@@ -944,6 +944,9 @@ public class QuestionService implements IQuestionService, ApplicationEventPublis
 			List<String> questionIds = questionSortOrder.getSortOrder();
 			for (String t : questionIds) {
 				Question tempQuestion = getQuestion(t);
+				if (tempQuestion == null) {
+					break;
+				}
 				if (onlyActive) {
 					if (tempQuestion.isActive()) {
 						questions.add(tempQuestion);