diff --git a/slsReceiverSoftware/src/Listener.cpp b/slsReceiverSoftware/src/Listener.cpp
index 732d769c1..b28b86377 100644
--- a/slsReceiverSoftware/src/Listener.cpp
+++ b/slsReceiverSoftware/src/Listener.cpp
@@ -227,8 +227,10 @@ void Listener::ShutDownUDPSocket() {
 		udpSocket->ShutDownSocket();
 		FILE_LOG(logINFO) << "Shut down of UDP port " << *udpPortNumber;
 		fflush(stdout);
-		//delete socket at stoplistening
-	    sem_wait(&semaphore_socket);
+		// wait only if the threads have started as it is the threads that
+		//give a post to semaphore(at stopListening)
+		if (runningFlag)
+			sem_wait(&semaphore_socket);
         delete udpSocket;
         udpSocket = 0;
 	    sem_destroy(&semaphore_socket);
diff --git a/slsReceiverSoftware/src/slsReceiverImplementation.cpp b/slsReceiverSoftware/src/slsReceiverImplementation.cpp
index 928812e81..5e21127e5 100644
--- a/slsReceiverSoftware/src/slsReceiverImplementation.cpp
+++ b/slsReceiverSoftware/src/slsReceiverImplementation.cpp
@@ -1039,7 +1039,7 @@ int slsReceiverImplementation::startReceiver(char *c) {
 	//processor->writer
 	if (fileWriteEnable) {
 		if (SetupWriter() == FAIL) {
-			strcpy(c,"Could not create file.");
+			strcpy(c,"Could not create file.\n");
 			FILE_LOG(logERROR) << c;
 			return FAIL;
 		}