diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c
index 0ff2fe15aed..46a16be6501 100644
--- a/src/modules/cdp/receiver.c
+++ b/src/modules/cdp/receiver.c
@@ -839,6 +839,7 @@ int receive_loop(peer *original_peer)
 int peer_connect(peer *p)
 {
 	int sock;
+	int tmp = 0;
 	unsigned int option = 1;
 
 	struct addrinfo *ainfo=0,*res=0,*sainfo=0,hints;
@@ -930,10 +931,21 @@ int peer_connect(peer *p)
 			}
 
 			x=fcntl(sock,F_GETFL,0);
-			fcntl(sock,F_SETFL,x & (~O_NONBLOCK));
+			if (x == -1) {
+				LM_ERR("error during first fcntl operation\n");
+				goto error;
+			}
+			tmp = fcntl(sock,F_SETFL,x & (~O_NONBLOCK));
+			if (tmp == -1) {
+				LM_ERR("error during second fcntl operation\n");
+				goto error;
+			}
+		}
+		tmp = setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option));
+		if (tmp == -1) {
+			LM_ERR("could not set socket options\n");
+			goto error;
 		}
-		setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option));
-
 		LM_INFO("peer_connect(): Peer %.*s:%d connected\n",p->fqdn.len,p->fqdn.s,p->port);
 
 		if (!send_fd(p->fd_exchange_pipe,sock,p)){
@@ -943,10 +955,12 @@ int peer_connect(peer *p)
 		}
 
 		if (res) freeaddrinfo(res);
+		if (sainfo) freeaddrinfo(sainfo);
 		return sock;
 	}
 error:
 	if (res) freeaddrinfo(res);
+	if (sainfo) freeaddrinfo(sainfo);
 	return -1;
 }