2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/dns/dns.c b/src/plugins/dns/dns.c
index 870cfae5074..47955452d3c 100644
--- a/src/plugins/dns/dns.c
+++ b/src/plugins/dns/dns.c
@@ -2795,7 +2795,7 @@ vnet_send_dns4_reply (dns_main_t * dm, dns_pending_request_t * pr,
   u8 *reply;
   vl_api_dns_resolve_name_reply_t _rnr, *rnr = &_rnr;
   vl_api_dns_resolve_ip_reply_t _rir, *rir = &_rir;
-  u32 ttl, tmp;
+  u32 ttl = 64, tmp;
   u32 qp_offset;
   dns_query_t *qp;
   dns_rr_t *rr;
diff --git a/src/plugins/dns/dns_test.c b/src/plugins/dns/dns_test.c
index 6b0b371dca1..ada9c0b7aa1 100644
--- a/src/plugins/dns/dns_test.c
+++ b/src/plugins/dns/dns_test.c
@@ -186,6 +186,12 @@ api_dns_resolve_name (vat_main_t * vam)
 	break;
     }
 
+  if (name == 0)
+    {
+      errmsg ("missing name to resolve");
+      return -99;
+    }
+
   if (vec_len (name) > 127)
     {
       errmsg ("name too long");