diff --git a/nlsr_km.c b/nlsr_km.c
index 6ac2817..3aa706b 100644
--- a/nlsr_km.c
+++ b/nlsr_km.c
@@ -147,10 +147,12 @@
  		return -1;
 	}
 
+	ccn_keystore_destroy(&keystore);
 	ccn_charbuf_destroy(&sp.template_ccnb);
 	ccn_charbuf_destroy(&keyid);
 	ccn_charbuf_destroy(&keyname);
 	ccn_charbuf_destroy(&pubid_out);
+	
 	free(baseuri);
  	return 0;
 }