diff --git a/src/main/java/de/thm/arsnova/services/SessionService.java b/src/main/java/de/thm/arsnova/services/SessionService.java
index 74940d24a7919625005402968ec09590b7f14963..a2df7abf69a6a15da18c673733decee40073d0d3 100644
--- a/src/main/java/de/thm/arsnova/services/SessionService.java
+++ b/src/main/java/de/thm/arsnova/services/SessionService.java
@@ -356,11 +356,15 @@ public class SessionService implements ISessionService, ApplicationEventPublishe
 
 		for (String subject : prepSubjects) {
 			SortOrder sortOrder = databaseDao.getSortOrder(session.get_id(), "preparation", subject);
-			databaseDao.deleteSortOrder(sortOrder);
+			if (sortOrder != null) {
+				databaseDao.deleteSortOrder(sortOrder);
+			}
 		}
 		for (String subject : lectureSubjects) {
 			SortOrder sortOrder = databaseDao.getSortOrder(session.get_id(), "lecture", subject);
-			databaseDao.deleteSortOrder(sortOrder);
+			if (sortOrder != null) {
+				databaseDao.deleteSortOrder(sortOrder);
+			}
 		}
 		databaseDao.deleteAllQuestionsWithAnswers(session);
 		databaseDao.deleteSession(session);