diff --git a/src/vnet/lisp-cp/control.c b/src/vnet/lisp-cp/control.c
index 4dc6836..cc3963d 100644
--- a/src/vnet/lisp-cp/control.c
+++ b/src/vnet/lisp-cp/control.c
@@ -2083,14 +2083,9 @@
 	      ls->name = vec_dup (a->name);
 
 	      if (!lcm->locator_set_index_by_name)
-		lcm->locator_set_index_by_name = hash_create_vec (
-								   /* size */
-								   0,
-								   sizeof
-								   (ls->name
-								    [0]),
-								   sizeof
-								   (uword));
+		lcm->locator_set_index_by_name =
+		  hash_create_vec ( /* size */ 0, sizeof (ls->name[0]),
+				   sizeof (uword));
 	      hash_set_mem (lcm->locator_set_index_by_name, ls->name,
 			    ls_index);
 
diff --git a/src/vnet/lisp-cp/lisp_cli.c b/src/vnet/lisp-cp/lisp_cli.c
index 31b2ca8..817fb50 100644
--- a/src/vnet/lisp-cp/lisp_cli.c
+++ b/src/vnet/lisp-cp/lisp_cli.c
@@ -1179,6 +1179,7 @@
 	}
     }
 
+  vec_terminate_c_string (locator_set_name);
   a->name = locator_set_name;
   a->locators = locators;
   a->is_add = is_add;