diff --git a/src/main/java/com/testify/Testify_Backend/controller/ExamSetterController.java b/src/main/java/com/testify/Testify_Backend/controller/ExamSetterController.java
index 676feea..80ffa3e 100644
--- a/src/main/java/com/testify/Testify_Backend/controller/ExamSetterController.java
+++ b/src/main/java/com/testify/Testify_Backend/controller/ExamSetterController.java
@@ -58,13 +58,10 @@ public ResponseEntity<Set<CandidateResponse>> getCandidatesForExam(@PathVariable
     }
     @GetMapping("/{examSetterId}/moderating-exams")
     public ResponseEntity<List<ModerateExamResponse>> getModeratingExams(@PathVariable long examSetterId) {
+        log.info("Getting exams moderated by exam setter with ID: {}", examSetterId);
         List<ModerateExamResponse> responses = examSetterService.getModeratingExams(examSetterId);
 
-        // Return null if no exams are found
-        if (responses.isEmpty()) {
-            return ResponseEntity.ok(null);
-        }
-
+        // Directly return the list, which will be empty if no exams are found
         return ResponseEntity.ok(responses);
     }
 
diff --git a/src/main/java/com/testify/Testify_Backend/service/AuthenticationService.java b/src/main/java/com/testify/Testify_Backend/service/AuthenticationService.java
index c194271..37e6cdd 100644
--- a/src/main/java/com/testify/Testify_Backend/service/AuthenticationService.java
+++ b/src/main/java/com/testify/Testify_Backend/service/AuthenticationService.java
@@ -326,8 +326,18 @@ public AuthenticationResponse authenticate(AuthenticationRequest request) {
                 response.setEmail(user.getEmail());
                 response.setUserName(user.getUsername());
                 response.setRole(user.getRole());
-                response.setFirstName(user instanceof Candidate ? ((Candidate) user).getFirstName() : user instanceof Organization ? ((Organization) user).getFirstName() : ( user instanceof Admin ? ((Admin) user).getFirstName() : null ));
-                response.setLastName(user instanceof Candidate ? ((Candidate) user).getLastName() : null);
+                response.setFirstName(
+                        user instanceof Candidate ? ((Candidate) user).getFirstName() :
+                                user instanceof Organization ? ((Organization) user).getFirstName() :
+                                        user instanceof Admin ? ((Admin) user).getFirstName() :
+                                                user instanceof ExamSetter ? ((ExamSetter) user).getFirstName() : null
+                );
+
+                response.setLastName(
+                        user instanceof Candidate ? ((Candidate) user).getLastName() :
+                                user instanceof ExamSetter ? ((ExamSetter) user).getLastName() : null
+                );
+
 
             } catch (Exception e) {
                 response.setSuccess(false);
diff --git a/src/main/java/com/testify/Testify_Backend/service/ExamSetterServiceImpl.java b/src/main/java/com/testify/Testify_Backend/service/ExamSetterServiceImpl.java
index 090c8b1..b10d743 100644
--- a/src/main/java/com/testify/Testify_Backend/service/ExamSetterServiceImpl.java
+++ b/src/main/java/com/testify/Testify_Backend/service/ExamSetterServiceImpl.java
@@ -110,6 +110,7 @@ public Set<CandidateResponse> getCandidatesForExam(Long examId) {
 
         return candidateResponses;
     }
+
     public List<ModerateExamResponse> getModeratingExams(long examSetterId) {
         return examRepository.findByModeratorId(examSetterId).stream()
                 .map(exam -> new ModerateExamResponse(