diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/FullLmsIntegrationServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/FullLmsIntegrationServiceImpl.java
index 3857d5b50..32b27a468 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/FullLmsIntegrationServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/FullLmsIntegrationServiceImpl.java
@@ -671,6 +671,11 @@ private Exam applyConnectionConfiguration(final Exam exam) {
     }
 
     private boolean hasFullIntegration(final Long lmsSetupId) {
+        // no LMS
+        if (lmsSetupId == null) {
+            return false;
+        }
+
         final LmsAPITemplate lmsAPITemplate = this.lmsAPITemplateCacheService
                 .getLmsAPITemplate(lmsSetupId)
                 .getOrThrow();
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginFullIntegration.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginFullIntegration.java
index 23cfb44a5..7cf3ae7bd 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginFullIntegration.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginFullIntegration.java
@@ -246,8 +246,6 @@ public Result<Exam> applyConnectionConfiguration(final Exam exam, final byte[] c
             final String quizId = MoodleUtils.getQuizId(exam.externalId);
             final String fileName = getConnectionConfigFileName(exam);
 
-
-
             final MultiValueMap<String, Object> multiPartAttributes = new LinkedMultiValueMap<>();
             multiPartAttributes.add("quizid", quizId);
             multiPartAttributes.add("name", fileName);
@@ -259,19 +257,13 @@ public String getFilename() {
                 }
             };
 
-            log.info("Upload Connection Configuration to Moodle: quizid: {}, fileName: {}, content: {}", quizId, fileName, contentsAsResource );
-
             multiPartAttributes.add("file", contentsAsResource);
 
             final MoodleAPIRestTemplate rest = getRestTemplate().getOrThrow();
             final String response = rest.uploadMultiPart(UPLOAD_ENDPOINT, multiPartAttributes);
 
-            if (response != null && (response.startsWith("{\"exception\":") || response.startsWith("0"))) {
-                log.warn("Failed to apply Connection Configuration to LMS for Exam: {}", exam.externalId);
-            }
-
-            if (response != null && (response.startsWith("{\"warnings\":"))) {
-                log.info("Moodle warnings in response: {}", response);
+            if (response != null) {
+                log.info("Upload Connection Configuration to Moodle: quizid: {}, fileName: {} response: {}", quizId, fileName, response );
             }
 
             return exam;
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringAPIBinding.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringAPIBinding.java
index e39502976..957e9e89a 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringAPIBinding.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringAPIBinding.java
@@ -676,14 +676,12 @@ String createSEBSession(
             final ScreenProctoringGroup localGroup,
             final ClientConnectionRecord clientConnection) {
 
-        // TODO check if the Session with token UUID already exists and if true, return the token
 
         final String token = clientConnection.getConnectionToken();
         final ScreenProctoringServiceOAuthTemplate apiTemplate = this.getAPITemplate(examId);
         final String uri = UriComponentsBuilder
                 .fromUriString(apiTemplate.spsAPIAccessData.getSpsServiceURL())
                 .path(SPS_API.SESSION_ENDPOINT)
-
                 .build()
                 .toUriString();
 
@@ -983,7 +981,9 @@ private static MultiValueMap<String, String> createExamCreationParams(
         final MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
         params.add(SPS_API.EXAM.ATTR_UUID, uuid);
         params.add(SPS_API.EXAM.ATTR_NAME, exam.name);
-        params.add(SPS_API.EXAM.ATTR_DESCRIPTION, exam.getDescription());
+        if (exam.getDescription() != null) {
+            params.add(SPS_API.EXAM.ATTR_DESCRIPTION, exam.getDescription());
+        }
         params.add(SPS_API.EXAM.ATTR_URL, exam.getStartURL());
         if (!userIds.isEmpty()) {
             params.add(SPS_API.EXAM.ATTR_USER_IDS, StringUtils.join(userIds, Constants.LIST_SEPARATOR));
diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringServiceImpl.java
index 0edc8dddd..8c3e2d411 100644
--- a/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringServiceImpl.java
+++ b/src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/proctoring/ScreenProctoringServiceImpl.java
@@ -60,7 +60,6 @@
 public class ScreenProctoringServiceImpl implements ScreenProctoringService {
 
     private static final Logger log = LoggerFactory.getLogger(ScreenProctoringServiceImpl.class);
-
     private final Cryptor cryptor;
     private final ScreenProctoringAPIBinding screenProctoringAPIBinding;
     private final ScreenProctoringGroupDAO screenProctoringGroupDAO;