diff --git a/app/main.cpp b/app/main.cpp
index 21f1de0d..8605e5d3 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -7,8 +7,7 @@
 #include <signal.h>
 
 void my_handler(int s){
-	printf("Ctrl-C caught! Quitting application...\n");
-	QApplication::closeAllWindows();
+	printf("\nCtrl-C caught! Quitting application...\n");
 	QApplication::quit();
 }
 
@@ -133,13 +132,15 @@ int main(int argc, char* argv[])
 		mainWindow.startProcessing();
 	}
 
-
-	// Catch ctrl-c to close the gui
-	struct sigaction sigIntHandler;
-	sigIntHandler.sa_handler = my_handler;
-	sigemptyset(&sigIntHandler.sa_mask);
-	sigIntHandler.sa_flags = 0;
-	sigaction(SIGINT, &sigIntHandler, NULL);
+	if(!guiMode)
+	{
+		// Catch ctrl-c to close the gui
+		struct sigaction sigIntHandler;
+		sigIntHandler.sa_handler = my_handler;
+		sigemptyset(&sigIntHandler.sa_mask);
+		sigIntHandler.sa_flags = 0;
+		sigaction(SIGINT, &sigIntHandler, NULL);
+	}
 
     return app.exec();
 }
diff --git a/src/Camera.cpp b/src/Camera.cpp
index ac5bb674..d7973048 100644
--- a/src/Camera.cpp
+++ b/src/Camera.cpp
@@ -76,7 +76,7 @@ void CameraTcpClient::displayError(QAbstractSocket::SocketError socketError)
 
 void CameraTcpClient::connectionLost()
 {
-	printf("[WARNING] CameraTcp: Connection lost!\n");
+	//printf("[WARNING] CameraTcp: Connection lost!\n");
 }
 
 Camera::Camera(QObject * parent) :