diff --git a/uppsrc/Core/Socket.cpp b/uppsrc/Core/Socket.cpp
index 80212d8c3..235e8283d 100644
--- a/uppsrc/Core/Socket.cpp
+++ b/uppsrc/Core/Socket.cpp
@@ -388,7 +388,7 @@ bool TcpSocket::Accept(TcpSocket& ls)
 		socket = accept(ls.GetSOCKET(), NULL, NULL);
 		if(socket != INVALID_SOCKET)
 			break;
-		if(!WouldBlock()) { // In prefork condition, Wait is not enough, as other process can accept
+		if(!WouldBlock() && GetErrorCode() != SOCKERR(EINTR)) { // In prefork condition, Wait is not enough, as other process can accept
 			SetSockError("accept");
 			return false;
 		}
@@ -614,7 +614,7 @@ bool TcpSocket::RawWait(dword flags, int end_time)
 		FD_SET(socket, fdsetx);
 		int avail = select((int)socket + 1, fdsetr, fdsetw, fdsetx, tvalp);
 		LLOG("Wait select avail: " << avail);
-		if(avail < 0) {
+		if(avail < 0 && GetErrorCode() != SOCKERR(EINTR)) {
 			SetSockError("wait");
 			return false;
 		}
diff --git a/uppsrc/Skylark/App.cpp b/uppsrc/Skylark/App.cpp
index 7bca162d0..6cd5ab9c3 100644
--- a/uppsrc/Skylark/App.cpp
+++ b/uppsrc/Skylark/App.cpp
@@ -188,8 +188,7 @@ void SkylarkApp::Run()
 	
 	IpAddrInfo ipinfo;
 	ipinfo.Execute(ip, port, IpAddrInfo::FAMILY_IPV4);
-//	addrinfo *addr = ipinfo.GetResult();
-
+	
 #ifdef _DEBUG
 	int qq = 0;
 	for(;;) {