diff --git a/modules/cdp/authstatemachine.c b/modules/cdp/authstatemachine.c
index b4790802573..203dfef393a 100644
--- a/modules/cdp/authstatemachine.c
+++ b/modules/cdp/authstatemachine.c
@@ -754,12 +754,14 @@ void Send_ASA(cdp_session_t* s, AAAMessage* msg) {
 			// the PCRF because TS 29.214 says no Destination-Host and no Auth-Application-Id
 			// in the ASA
 			LM_INFO("sending ASA to peer %.*s\n", avp->data.len, avp->data.s);
-			peer *p;
-			p = get_peer_by_fqdn(&avp->data);
-			if (!peer_send_msg(p, asa)) {
+			peer *p = get_peer_by_fqdn(&avp->data);
+			if (!p) {
+				LM_ERR("Peer not found\n");
+			}else if (!peer_send_msg(p, asa)) {
 				if (asa) AAAFreeMessage(&asa); //needed in frequency
-			} else
+			} else {
 				LM_INFO("success sending ASA\n");
+			}
 		} else if (!AAASendMessage(asa, 0, 0)) {
 			LM_ERR("Send_ASA() : error sending ASA\n");
 		}
diff --git a/modules/cdp/peermanager.c b/modules/cdp/peermanager.c
index bce1c0e689e..1d6f6a99df7 100644
--- a/modules/cdp/peermanager.c
+++ b/modules/cdp/peermanager.c
@@ -209,7 +209,7 @@ peer *get_peer_from_sock(int sock)
 peer *get_peer_from_fqdn(str fqdn,str realm)
 {
 	peer *i;
-	str dumb;
+	str dumb = {0,0};
 
 	lock_get(peer_list_lock);
 	i = peer_list->head;