diff --git a/Makefile.in b/Makefile.in
index a3442015a..98f9f12f5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,7 +116,7 @@ install-config:
 	@echo "- Installing main configuration file."
 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/
 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/vscp
-	$(INSTALL_PROGRAM) -b -m744 install_files/unix/vscpd.conf $(DESTDIR)/etc/vscp/vscpd.conf
+#	$(INSTALL_PROGRAM) -b -m744 install_files/unix/vscpd.conf $(DESTDIR)/etc/vscp/vscpd.conf
 	@if [ ! -e $(DESTDIR)/etc/vscp/vscpd.conf ]; then\
 	    $(INSTALL_PROGRAM) -b -m744 install_files/unix/vscpd.conf $(DESTDIR)/etc/vscp/vscpd.conf;\
 	else\
diff --git a/src/vscp/common/tcpipsrv.cpp b/src/vscp/common/tcpipsrv.cpp
index 96a301a5e..5ccf0dc6c 100644
--- a/src/vscp/common/tcpipsrv.cpp
+++ b/src/vscp/common/tcpipsrv.cpp
@@ -222,7 +222,7 @@ void *TCPListenThread::Entry()
                         if ( NULL == pThread ) {
                             gpobj->logMsg( _("[TCP/IP srv] -- Memory problem when creating client thread.\n") );
                             stcp_close_connection( conn );
-                            delete conn;
+                            conn == NULL;
                             continue;
                         }
 
@@ -237,7 +237,7 @@ void *TCPListenThread::Entry()
                             if ( wxTHREAD_NO_ERROR != ( err = pThread->Run() ) ) {
                                 gpobj->logMsg(_("[TCP/IP srv] -- Unable to run TCP client thread.") );
                                 stcp_close_connection( conn );
-                                delete conn;
+                                conn == NULL;
                                 delete pThread;
                                 continue;
                             }
@@ -246,7 +246,7 @@ void *TCPListenThread::Entry()
                         else {
                             gpobj->logMsg( _("[TCP/IP srv] -- Unable to create TCP client thread.") );
                             stcp_close_connection( conn );
-                            delete conn;
+                            conn == NULL;
                             delete pThread;
                             continue;
                         }
@@ -2494,6 +2494,7 @@ void TCPClientThread::handleClientShutdown( void )
 
     write(   MSG_GOODBY, strlen ( MSG_GOODBY ) );
     stcp_close_connection( m_conn );
+    m_conn == NULL;
 }