diff --git a/deps/miniupnpc/connecthostport.c b/deps/miniupnpc/connecthostport.c
index 8eabfca0d2..e1d5e8a886 100644
--- a/deps/miniupnpc/connecthostport.c
+++ b/deps/miniupnpc/connecthostport.c
@@ -42,13 +42,6 @@
 #endif /* #ifndef USE_GETHOSTBYNAME */
 #endif /* #else _WIN32 */
 
-/* definition of PRINT_SOCKET_ERROR */
-#ifdef _WIN32
-#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
-#else
-#define PRINT_SOCKET_ERROR(x) perror(x)
-#endif
-
 #if defined(__amigaos__) || defined(__amigaos4__)
 #define herror(A) printf("%s\n", A)
 #endif
@@ -92,23 +85,18 @@ int connecthostport(const char * host, unsigned short port,
 	memset(dest.sin_zero, 0, sizeof(dest.sin_zero));
 	s = socket(PF_INET, SOCK_STREAM, 0);
 	if(s < 0)
-	{
-		PRINT_SOCKET_ERROR("socket");
 		return -1;
-	}
 #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT
 	/* setting a 3 seconds timeout for the connect() call */
 	timeout.tv_sec = 3;
 	timeout.tv_usec = 0;
 	if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(struct timeval)) < 0)
 	{
-		PRINT_SOCKET_ERROR("setsockopt SO_RCVTIMEO");
 	}
 	timeout.tv_sec = 3;
 	timeout.tv_usec = 0;
 	if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &timeout, sizeof(struct timeval)) < 0)
 	{
-		PRINT_SOCKET_ERROR("setsockopt SO_SNDTIMEO");
 	}
 #endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
 	dest.sin_family = AF_INET;
@@ -131,7 +119,6 @@ int connecthostport(const char * host, unsigned short port,
 		/*n = getpeername(s, NULL, &len);*/
 		len = sizeof(err);
 		if(getsockopt(s, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
-			PRINT_SOCKET_ERROR("getsockopt");
 			closesocket(s);
 			return -1;
 		}
@@ -143,7 +130,6 @@ int connecthostport(const char * host, unsigned short port,
 #endif /* #ifdef MINIUPNPC_IGNORE_EINTR */
 	if(n<0)
 	{
-		PRINT_SOCKET_ERROR("connect");
 		closesocket(s);
 		return -1;
 	}
@@ -201,13 +187,11 @@ int connecthostport(const char * host, unsigned short port,
 		timeout.tv_usec = 0;
 		if(setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (const char *)&timeout, sizeof(struct timeval)) < 0)
 		{
-			PRINT_SOCKET_ERROR("setsockopt");
 		}
 		timeout.tv_sec = 3;
 		timeout.tv_usec = 0;
 		if(setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (const char *)&timeout, sizeof(struct timeval)) < 0)
 		{
-			PRINT_SOCKET_ERROR("setsockopt");
 		}
 #endif /* #ifdef MINIUPNPC_SET_SOCKET_TIMEOUT */
 		n = connect(s, p->ai_addr, p->ai_addrlen);
@@ -228,7 +212,6 @@ int connecthostport(const char * host, unsigned short port,
 			/*n = getpeername(s, NULL, &len);*/
 			len = sizeof(err);
 			if(getsockopt(s, SOL_SOCKET, SO_ERROR, &err, &len) < 0) {
-				PRINT_SOCKET_ERROR("getsockopt");
 				closesocket(s);
 				freeaddrinfo(ai);
 				return -1;
@@ -251,15 +234,9 @@ int connecthostport(const char * host, unsigned short port,
 	}
 	freeaddrinfo(ai);
 	if(s < 0)
-	{
-		PRINT_SOCKET_ERROR("socket");
 		return -1;
-	}
 	if(n < 0)
-	{
-		PRINT_SOCKET_ERROR("connect");
 		return -1;
-	}
 #endif /* #ifdef USE_GETHOSTBYNAME */
 	return s;
 }
diff --git a/deps/miniupnpc/minisoap.c b/deps/miniupnpc/minisoap.c
index 0757245dc2..694b2dbecd 100644
--- a/deps/miniupnpc/minisoap.c
+++ b/deps/miniupnpc/minisoap.c
@@ -24,12 +24,6 @@
 /* only for malloc */
 #include <stdlib.h>
 
-#ifdef _WIN32
-#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
-#else
-#define PRINT_SOCKET_ERROR(x) perror(x)
-#endif
-
 /* httpWrite sends the headers and the body to the socket
  * and returns the number of bytes sent */
 static int
@@ -51,20 +45,8 @@ httpWrite(int fd, const char * body, int bodysize,
 	memcpy(p+headerssize, body, bodysize);
 	/*n = write(fd, p, headerssize+bodysize);*/
 	n = (int)send(fd, p, headerssize+bodysize, 0);
-	if(n<0) {
-	  PRINT_SOCKET_ERROR("send");
-	}
 	/* disable send on the socket */
 	/* draytek routers dont seems to like that... */
-#if 0
-#ifdef _WIN32
-	if(shutdown(fd, SD_SEND)<0) {
-#else
-	if(shutdown(fd, SHUT_WR)<0)	{ /*SD_SEND*/
-#endif
-		PRINT_SOCKET_ERROR("shutdown");
-	}
-#endif
 	free(p);
 	return n;
 }
diff --git a/deps/miniupnpc/minissdpc.c b/deps/miniupnpc/minissdpc.c
index 6cf1570787..9a5ff54ee7 100644
--- a/deps/miniupnpc/minissdpc.c
+++ b/deps/miniupnpc/minissdpc.c
@@ -61,12 +61,6 @@ struct sockaddr_un {
 #define closesocket close
 #endif
 
-#ifdef _WIN32
-#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
-#else
-#define PRINT_SOCKET_ERROR(x) perror(x)
-#endif
-
 #if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__GNU__) && !defined(__FreeBSD_kernel__)  && !defined(__HAIKU__)
 #define HAS_IP_MREQN
 #endif
@@ -523,7 +517,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 	{
 		if(error)
 			*error = MINISSDPC_SOCKET_ERROR;
-		PRINT_SOCKET_ERROR("socket");
 		return NULL;
 	}
 	/* reception */
@@ -589,9 +582,7 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 						struct in_addr mc_if;
 						memset(&mc_if, 0, sizeof(mc_if));
 						mc_if.s_addr = pIPAddrTable->table[i].dwAddr;
-						if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0) {
-							PRINT_SOCKET_ERROR("setsockopt");
-						}
+						setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0;
 						((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = pIPAddrTable->table[i].dwAddr;
 #ifndef DEBUG
 						break;
@@ -613,7 +604,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 	{
 		if(error)
 			*error = MINISSDPC_SOCKET_ERROR;
-		PRINT_SOCKET_ERROR("setsockopt(SO_REUSEADDR,...)");
 		return NULL;
 	}
 
@@ -624,7 +614,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 #endif /* _WIN32 */
 	{
 		/* not a fatal error */
-		PRINT_SOCKET_ERROR("setsockopt(IP_MULTICAST_TTL,...)");
 	}
 
 	if(multicastif)
@@ -637,7 +626,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 			unsigned int ifindex = if_nametoindex(multicastif); /* eth0, etc. */
 			if(setsockopt(sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &ifindex, sizeof(ifindex)) < 0)
 			{
-				PRINT_SOCKET_ERROR("setsockopt IPV6_MULTICAST_IF");
 			}
 #else
 #ifdef DEBUG
@@ -652,7 +640,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 				((struct sockaddr_in *)&sockudp_r)->sin_addr.s_addr = mc_if.s_addr;
 				if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0)
 				{
-					PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF");
 				}
 			} else {
 #ifdef HAS_IP_MREQN
@@ -662,7 +649,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 				reqn.imr_ifindex = if_nametoindex(multicastif);
 				if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&reqn, sizeof(reqn)) < 0)
 				{
-					PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF");
 				}
 #elif !defined(_WIN32)
 				struct ifreq ifr;
@@ -671,12 +657,10 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 				ifr.ifr_name[IFNAMSIZ-1] = '\0';
 				if(ioctl(sudp, SIOCGIFADDR, &ifr, &ifrlen) < 0)
 				{
-					PRINT_SOCKET_ERROR("ioctl(...SIOCGIFADDR...)");
 				}
 				mc_if.s_addr = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr;
 				if(setsockopt(sudp, IPPROTO_IP, IP_MULTICAST_IF, (const char *)&mc_if, sizeof(mc_if)) < 0)
 				{
-					PRINT_SOCKET_ERROR("setsockopt IP_MULTICAST_IF");
 				}
 #else /* _WIN32 */
 #ifdef DEBUG
@@ -694,7 +678,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 	{
 		if(error)
 			*error = MINISSDPC_SOCKET_ERROR;
-		PRINT_SOCKET_ERROR("bind");
 		closesocket(sudp);
 		return NULL;
 	}
@@ -751,7 +734,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 		if (n < 0) {
 			if(error)
 				*error = MINISSDPC_SOCKET_ERROR;
-			PRINT_SOCKET_ERROR("sendto");
 			break;
 		}
 #else /* #ifdef NO_GETADDRINFO */
@@ -782,7 +764,6 @@ ssdpDiscoverDevices(const char * const deviceTypes[],
 					fprintf(stderr, "host:%s port:%s\n", hbuf, sbuf);
 				}
 #endif
-				PRINT_SOCKET_ERROR("sendto");
 				continue;
 			}
 		}
diff --git a/deps/miniupnpc/receivedata.c b/deps/miniupnpc/receivedata.c
index 6f9d7ec0c9..2189984438 100644
--- a/deps/miniupnpc/receivedata.c
+++ b/deps/miniupnpc/receivedata.c
@@ -27,12 +27,6 @@
 #define MINIUPNPC_IGNORE_EINTR
 #endif /* _WIN32 */
 
-#ifdef _WIN32
-#define PRINT_SOCKET_ERROR(x)    printf("Socket error: %s, %d\n", x, WSAGetLastError());
-#else
-#define PRINT_SOCKET_ERROR(x) perror(x)
-#endif
-
 #include "receivedata.h"
 
 int
@@ -57,13 +51,11 @@ receivedata(int socket,
 #ifdef MINIUPNPC_IGNORE_EINTR
     } while(n < 0 && errno == EINTR);
 #endif	/* MINIUPNPC_IGNORE_EINTR */
-    if(n < 0) {
-        PRINT_SOCKET_ERROR("poll");
+    if(n < 0)
         return -1;
-    } else if(n == 0) {
-		/* timeout */
+    /* timeout */
+    if(n == 0)
         return 0;
-    }
 #else	/* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */
 	/* using select under _WIN32 and amigaos */
     fd_set socketSet;
@@ -73,12 +65,10 @@ receivedata(int socket,
     timeval.tv_sec = timeout / 1000;
     timeval.tv_usec = (timeout % 1000) * 1000;
     n = select(FD_SETSIZE, &socketSet, NULL, NULL, &timeval);
-    if(n < 0) {
-        PRINT_SOCKET_ERROR("select");
-        return -1;
-    } else if(n == 0) {
-        return 0;
-    }
+    if(n < 0)
+       return -1;
+    if(n == 0)
+       return 0;
 #endif	/* !defined(_WIN32) && !defined(__amigaos__) && !defined(__amigaos4__) */
 #ifdef MINIUPNPC_GET_SRC_ADDR
 	memset(&src_addr, 0, sizeof(src_addr));
@@ -87,10 +77,6 @@ receivedata(int socket,
 #else	/* MINIUPNPC_GET_SRC_ADDR */
 	n = (int)recv(socket, data, length, 0);
 #endif	/* MINIUPNPC_GET_SRC_ADDR */
-	if(n<0)
-    {
-		PRINT_SOCKET_ERROR("recv");
-	}
 #ifdef MINIUPNPC_GET_SRC_ADDR
 	if (src_addr.ss_family == AF_INET6) {
 		const struct sockaddr_in6 * src_addr6 = (struct sockaddr_in6 *)&src_addr;