diff --git a/libretroshare/src/pqi/pqinetwork.cc b/libretroshare/src/pqi/pqinetwork.cc
index 97e901343..e2f9a7207 100644
--- a/libretroshare/src/pqi/pqinetwork.cc
+++ b/libretroshare/src/pqi/pqinetwork.cc
@@ -143,7 +143,7 @@ std::list<std::string> getLocalInterfaces()
 	{
 		pqioutput(PQL_ALERT, pqinetzone, 
 			"Cannot Determine Local Addresses!");
-		exit(1);
+                return addrs;
 	}
 
 	if (!ifptr)
diff --git a/libretroshare/src/pqi/pqissllistener.cc b/libretroshare/src/pqi/pqissllistener.cc
index a7b3f5c9b..06245ebc2 100644
--- a/libretroshare/src/pqi/pqissllistener.cc
+++ b/libretroshare/src/pqi/pqissllistener.cc
@@ -211,9 +211,8 @@ int	pqissllistenbase::setuplisten()
 		out << " Cannot Bind to Local Address!" << std::endl;
 		showSocketError(out);
 		pqioutput(PQL_ALERT, pqissllistenzone, out.str());
-		std::cerr << out.str() << std::endl;
+                std::cerr << out.str() << std::endl;
 
-		exit(1); 
 		return -1;
 	}
 	else
@@ -232,7 +231,6 @@ int	pqissllistenbase::setuplisten()
 		pqioutput(PQL_ALERT, pqissllistenzone, out.str());
 		std::cerr << out.str() << std::endl;
 
-		exit(1); 
 		return -1;
 	}
 	else
diff --git a/libretroshare/src/tcponudp/tcpstream.cc b/libretroshare/src/tcponudp/tcpstream.cc
index ef8d7cb74..e9497d234 100644
--- a/libretroshare/src/tcponudp/tcpstream.cc
+++ b/libretroshare/src/tcponudp/tcpstream.cc
@@ -1818,7 +1818,7 @@ int TcpStream::toSend(TcpPacket *pkt, bool retrans)
 		std::cerr << "TcpStream::toSend() peerUnknown ERROR!!!";
 		std::cerr << std::endl;
 #endif
-		exit(1);
+                return 0;
 	}
 
 	/* get accurate timestamp */
@@ -1908,7 +1908,7 @@ int TcpStream::retrans()
 		std::cerr << "TcpStream::retrans() peerUnknown ERROR!!!";
 		std::cerr << std::endl;
 #endif
-		exit(1);
+                return 0;
 	}
 	
 	/* now retrans */
diff --git a/libretroshare/src/tcponudp/tou.cc b/libretroshare/src/tcponudp/tou.cc
index 1c08addbf..b6ee4d1d7 100644
--- a/libretroshare/src/tcponudp/tou.cc
+++ b/libretroshare/src/tcponudp/tou.cc
@@ -72,7 +72,7 @@ int 	tou_init(const struct sockaddr *my_addr, socklen_t addrlen)
 				<< inet_ntoa(addr->sin_addr) << ":" << ntohs(addr->sin_port);
 			std::cerr << std::endl;
 
-			exit(1);
+                        return 0;
 		}
 		return 1;
 	}
@@ -198,11 +198,6 @@ int     tou_socket(int /*domain*/, int /*type*/, int /*protocol*/)
 	tou -> lasterrno = EUSERS;
 
 	return -1;
-
-#ifdef DEBUG_TOU_INTERFACE
-	std::cerr << "tou_socket() FAILED" << std::endl;
-	exit(1);
-#endif 
 }
 
 /* 	bind - opens the udp port */