diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c
index 3f7126b65877e268b1b52dee1db388e20415b87a..d0215c3a2641bd69f1039113dbf7abcdb479b5d5 100644
--- a/coreapi/bellesip_sal/sal_impl.c
+++ b/coreapi/bellesip_sal/sal_impl.c
@@ -247,6 +247,9 @@ void sal_certificates_chain_parse_directory(char **certificate_pem, char **key_p
 				*certificate_pem = belle_sip_certificates_chain_get_pem(certificate);
 				*key_pem = belle_sip_signing_key_get_pem(key);
 				ms_message("Generate self-signed certificate with CN=%s successful\n", subject);
+			}else{
+				ms_error("Self-signed certificate generation failed.");
+				return;
 			}
 		}
 	}
diff --git a/src/conference/session/media-session.cpp b/src/conference/session/media-session.cpp
index 33c150e3bff876ac8b6d26baadfadd455915088b..32042b40b5329fbdd747a8f23897fabe77c9965d 100644
--- a/src/conference/session/media-session.cpp
+++ b/src/conference/session/media-session.cpp
@@ -1757,6 +1757,7 @@ void MediaSessionPrivate::setupDtlsParams (MediaStream *ms) {
 		char *certificate = nullptr;
 		char *key = nullptr;
 		char *fingerprint = nullptr;
+		
 		sal_certificates_chain_parse_directory(&certificate, &key, &fingerprint,
 			linphone_core_get_user_certificates_path(q->getCore()->getCCore()), "linphone-dtls-default-identity", SAL_CERTIFICATE_RAW_FORMAT_PEM, true, true);
 		if (fingerprint) {