diff --git a/src/iec61850/server/mms_mapping/control.c b/src/iec61850/server/mms_mapping/control.c
index 29f12790..56e0820c 100644
--- a/src/iec61850/server/mms_mapping/control.c
+++ b/src/iec61850/server/mms_mapping/control.c
@@ -1451,7 +1451,7 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
                                 ADD_CAUSE_OBJECT_ALREADY_SELECTED, ctlNum, origin, true);
 
                     if (DEBUG_IED_SERVER)
-                        printf("SBOw: select failed!\n");
+                        printf("IED_SERVER: SBOw - select failed!\n");
                 }
                 else {
 
@@ -1479,7 +1479,7 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
                         indication = DATA_ACCESS_ERROR_SUCCESS;
 
                         if (DEBUG_IED_SERVER)
-                            printf("SBOw: selected successful\n");
+                            printf("IED_SERVER: SBOw - selected successful\n");
                     }
                     else {
                         indication = (MmsDataAccessError) checkResult;
@@ -1488,7 +1488,7 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
                                 controlObject->addCauseValue, ctlNum, origin, true);
 
                         if (DEBUG_IED_SERVER)
-                            printf("SBOw: select rejected by application!\n");
+                            printf("IED_SERVER: SBOw - select rejected by application!\n");
                     }
                 }
             }
@@ -1595,7 +1595,7 @@ Control_writeAccessControlObject(MmsMapping* self, MmsDomain* domain, char* vari
                         setState(controlObject, STATE_WAIT_FOR_ACTIVATION_TIME);
 
                         if (DEBUG_IED_SERVER)
-                            printf("Oper: activate time activated control\n");
+                            printf("IED_SERVER: Oper - activate time activated control\n");
 
                         indication = DATA_ACCESS_ERROR_SUCCESS;
                     }
diff --git a/src/mms/iso_mms/server/mms_server_connection.c b/src/mms/iso_mms/server/mms_server_connection.c
index 01f674a8..8bb7b7e1 100644
--- a/src/mms/iso_mms/server/mms_server_connection.c
+++ b/src/mms/iso_mms/server/mms_server_connection.c
@@ -464,13 +464,14 @@ mmsFileReadHandler(uint32_t invokeId, void* parameter, MmsError mmsError, int32_
     if (mmsError == MMS_ERROR_NONE) {
         if (DEBUG_MMS_SERVER)
             printf("MMS_SERVER:  file %i received %i bytes\n", task->frmsId, bytesReceived);
-            if(task->fileHandle){
-                FileSystem_writeFile(task->fileHandle, buffer, bytesReceived);
-            }
-            else{
-                if (DEBUG_MMS_SERVER)
-                    printf("MMS_SERVER: problem reading file %i file already closed\n", task->frmsId);
-            }
+
+        if(task->fileHandle){
+            FileSystem_writeFile(task->fileHandle, buffer, bytesReceived);
+        }
+        else{
+            if (DEBUG_MMS_SERVER)
+                printf("MMS_SERVER: problem reading file %i file already closed\n", task->frmsId);
+        }
     }
     else {
         if (DEBUG_MMS_SERVER)