diff --git a/slsReceiverSoftware/src/main.cpp b/slsReceiverSoftware/src/main.cpp
index bc05f7de2..ab5569508 100755
--- a/slsReceiverSoftware/src/main.cpp
+++ b/slsReceiverSoftware/src/main.cpp
@@ -4,7 +4,6 @@
 #include "logger.h"
 #include "Receiver.h"
 #include "sls_detector_defs.h"
-#include "container_utils.h" 
 
 #include <csignal>	//SIGINT
 #include <cstdlib>		//system
diff --git a/slsReceiverSoftware/src/multiReceiver.cpp b/slsReceiverSoftware/src/multiReceiver.cpp
index fb0882791..ce9053113 100755
--- a/slsReceiverSoftware/src/multiReceiver.cpp
+++ b/slsReceiverSoftware/src/multiReceiver.cpp
@@ -213,8 +213,13 @@ int main(int argc, char *argv[]) {
 		else if (pid == 0) {
 			cprintf(BLUE,"Child process %d [ Tid: %ld ]\n", i, (long)syscall(SYS_gettid));
 			
-			Receiver *receiver = new Receiver(startTCPPort + i);
-
+			std::unique_ptr<Receiver> receiver = nullptr;
+			try {
+				receiver = sls::make_unique<Receiver>(startTCPPort + i);
+			} catch (...) {
+				FILE_LOG(logINFOBLUE) << "Exiting Child Process [ Tid: " << syscall(SYS_gettid) << " ]";
+				throw;
+			}			
 			/**	- register callbacks. remember to set file write enable to 0 (using the client)
 		  if we should not write files and you will write data using the callbacks */
 			if (withCallback) {
@@ -236,8 +241,6 @@ int main(int argc, char *argv[]) {
 			/**	- as long as keeprunning is true (changes with Ctrl+C) */
 			while(keeprunning)
 				pause();
-			/**	- interrupt caught, delete Receiver object and exit */
-			delete receiver;
 			cprintf(BLUE,"Exiting Child Process [ Tid: %ld ]\n", (long)syscall(SYS_gettid));
 			exit(EXIT_SUCCESS);
 			break;