diff --git a/src/mms/iso_mms/client/mms_client_connection.c b/src/mms/iso_mms/client/mms_client_connection.c
index 90455d98..c91005cd 100644
--- a/src/mms/iso_mms/client/mms_client_connection.c
+++ b/src/mms/iso_mms/client/mms_client_connection.c
@@ -1058,11 +1058,12 @@ mmsClient_getNameListSingleRequest(
 
     ByteBuffer* responseMessage = sendRequestAndWaitForResponse(self, invokeId, payload);
 
-
-
     if (responseMessage != NULL)
         moreFollows = mmsClient_parseGetNameListResponse(nameList, self->lastResponse, NULL);
 
+    if (self->lastResponseError != MMS_ERROR_NONE)
+		*mmsError = self->lastResponseError;
+
     releaseResponse(self);
 
     if (self->associationState == MMS_STATE_CLOSED)
diff --git a/src/mms/iso_mms/server/mms_file_service.c b/src/mms/iso_mms/server/mms_file_service.c
index 4f2b63ec..d0780fb3 100644
--- a/src/mms/iso_mms/server/mms_file_service.c
+++ b/src/mms/iso_mms/server/mms_file_service.c
@@ -488,7 +488,6 @@ addFileEntriesToResponse(uint8_t* buffer, int bufPos, int maxBufSize, char* dire
 					int bufferSpaceLeft = maxBufSize - bufPos;
 
 					if (overallEntrySize > bufferSpaceLeft) {
-
 						*moreFollows = true;
 						break;
 					}