diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamConfigUpdateServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamConfigUpdateServiceImpl.java
index 7663f1b5..3c369f10 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamConfigUpdateServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamConfigUpdateServiceImpl.java
@@ -312,9 +312,7 @@ public class ExamConfigUpdateServiceImpl implements ExamConfigUpdateService {
 
     private Collection<Result<Exam>> lockForUpdate(final Collection<Long> examIds, final String update) {
         return examIds.stream()
-                .map(id -> this.examDAO.byPK(id)
-                        .map(exam -> this.examDAO.placeLock(exam, update))
-                        .getOrThrow())
+                .map(id -> this.examDAO.byPK(id).flatMap(exam -> this.examDAO.placeLock(exam, update)))
                 .collect(Collectors.toList());
     }