diff --git a/server/modules/protocol/httpd.c b/server/modules/protocol/httpd.c
index 5efd40e74..ca0022284 100644
--- a/server/modules/protocol/httpd.c
+++ b/server/modules/protocol/httpd.c
@@ -349,6 +349,7 @@ int	n_connect = 0;
 			}
 		}
 	}
+	close(so);
 	return n_connect;
 }
 
@@ -396,7 +397,7 @@ int			syseno = 0;
                    sizeof(one));
 
 	if(syseno != 0){
-		skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",syseno,strerror(syseno));
+		skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",errno,strerror(errno));
 		return 0;
 	}
         /* set NONBLOCKING mode */
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index d4d11f7b8..8a3e666f6 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -990,7 +990,7 @@ int gw_MySQLListener(
 
 	// socket options
 	if((syseno = setsockopt(l_so, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one))) != 0){
-		LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",syseno,strerror(syseno))));
+		LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",errno,strerror(errno))));
 	}
 
 
@@ -1214,13 +1214,13 @@ int gw_MySQLAccept(DCB *listener)
         	sendbuf = GW_CLIENT_SO_SNDBUF;
 
 			if((syseno = setsockopt(c_sock, SOL_SOCKET, SO_SNDBUF, &sendbuf, optlen)) != 0){
-				LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",syseno,strerror(syseno))));
+				LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",errno,strerror(errno))));
 			}
 
         	sendbuf = GW_CLIENT_SO_RCVBUF;
 
 			if((syseno = setsockopt(c_sock, SOL_SOCKET, SO_RCVBUF, &sendbuf, optlen)) != 0){
-				LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",syseno,strerror(syseno))));
+				LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",errno,strerror(errno))));
 			}
                 setnonblocking(c_sock);
                 
diff --git a/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c
index 4e9519d8a..e8c208c20 100644
--- a/server/modules/protocol/telnetd.c
+++ b/server/modules/protocol/telnetd.c
@@ -376,7 +376,7 @@ int			syseno = 0;
 	syseno = setsockopt(listener->fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one, sizeof(one));
 	
 	if(syseno != 0){
-		LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",syseno,strerror(syseno))));
+		LOGIF(LE, (skygw_log_write_flush(LOGFILE_ERROR,"Error: Failed to set socket options. Error %d: %s",errno,strerror(errno))));
 		return 0;
 	}
         // set NONBLOCKING mode