diff --git a/src/config.c b/src/config.c
index c31f0594..423d9d7a 100644
--- a/src/config.c
+++ b/src/config.c
@@ -376,7 +376,6 @@ unsigned i;
 	DEL(config->banner);
 	DEL(config->dh_params_file);
 	DEL(config->name);
-	DEL(config->cert);
 	DEL(config->pin_file);
 	DEL(config->srk_pin_file);
 	DEL(config->ca);
@@ -402,6 +401,7 @@ unsigned i;
 	DEL(config->key);
 	for (i=0;i<config->cert_size;i++)
 		DEL(config->cert[i]);
+	DEL(config->cert);
 	DEL(config->network.routes);
 	memset(config, 0, sizeof(*config));
 
diff --git a/src/tlslib.c b/src/tlslib.c
index c6d3598f..b86c28c9 100644
--- a/src/tlslib.c
+++ b/src/tlslib.c
@@ -257,7 +257,7 @@ int ret;
  * is compatible with all ciphersuites */
 static void certificate_check(main_server_st *s)
 {
-gnutls_datum_t data;
+gnutls_datum_t data = {NULL, 0};
 gnutls_x509_crt_t crt = NULL;
 int ret;
 unsigned usage;