diff --git a/lib/common/xml.c b/lib/common/xml.c
index 0effd47..f7779f5 100644
--- a/lib/common/xml.c
+++ b/lib/common/xml.c
@@ -2759,7 +2759,7 @@ create_xml_node(xmlNode * parent, const char *name)
     xmlNode *node = NULL;
 
     if (name == NULL || name[0] == 0) {
-        CRM_CHECK(name != NULL || name[0] == 0, return NULL);
+        CRM_CHECK(name != NULL && name[0] == 0, return NULL);
         return NULL;
     }
 
diff --git a/tools/crm_resource.c b/tools/crm_resource.c
index 236d43c..968683a 100644
--- a/tools/crm_resource.c
+++ b/tools/crm_resource.c
@@ -1430,7 +1430,6 @@ update_dataset(cib_t *cib, pe_working_set_t * data_set, bool simulate)
             goto cleanup;
         }
 
-        free(pid);
         rc = write_xml_file(cib_xml_copy, shadow_file, FALSE);
 
         if (rc < 0) {