Merge 855ac6b07b7b3204030843301b5485bbf82b8cb6 on remote branch

Change-Id: I888cb9b5f7c2a275725a6ae51e477d19d136f7b9
diff --git a/service/src/graph.c b/service/src/graph.c
index aea9e75..0e79b8c 100644
--- a/service/src/graph.c
+++ b/service/src/graph.c
@@ -705,7 +705,8 @@
         list_remove(node);
         temp_mod = node_to_item(node, module_info_t, list);
         if (temp_mod->gkv) {
-            free(temp_mod->gkv->kv);
+            if (temp_mod->gkv->kv)
+                free(temp_mod->gkv->kv);
             free(temp_mod->gkv);
         }
         free(temp_mod);