From 56120168b11570fb65e1295286fd9f9b4da33824 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 11 May 2023 09:33:24 +0200
Subject: [PATCH] code improvements

---
 .../impl/proctoring/ExamProctoringRoomServiceImpl.java       | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ExamProctoringRoomServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ExamProctoringRoomServiceImpl.java
index 891c4a9e..e0c469a8 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ExamProctoringRoomServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ExamProctoringRoomServiceImpl.java
@@ -326,6 +326,11 @@ public class ExamProctoringRoomServiceImpl implements ExamProctoringRoomService
                             cc.getExamId(),
                             cc.getConnectionToken());
 
+                    if (proctoringRoom == null) {
+                        log.warn("Assign SEB client to proctoring room failed for: {}", cc);
+                        return;
+                    }
+
                     if (log.isDebugEnabled()) {
                         log.debug("Assigning new SEB client to proctoring room: {}, connection: {}",
                                 proctoringRoom.id,