diff --git a/orte/mca/pls/xgrid/src/pls_xgrid_client.m b/orte/mca/pls/xgrid/src/pls_xgrid_client.m
index ab14536405..ec82db4632 100644
--- a/orte/mca/pls/xgrid/src/pls_xgrid_client.m
+++ b/orte/mca/pls/xgrid/src/pls_xgrid_client.m
@@ -101,7 +101,11 @@ mca_pls_xgrid_set_node_name(orte_ras_node_t* node,
         return ORTE_ERR_OUT_OF_RESOURCE;
     }
     kv->value->type = ORTE_NAME;
-    if (ORTE_SUCCESS != (rc = orte_dss.copy(&(kv->value->data), name, ORTE_NAME);
+    if (ORTE_SUCCESS != (rc = orte_dss.copy(&(kv->value->data), name, ORTE_NAME))) {
+        ORTE_ERROR_LOG(rc);
+	OBJ_RELEASE(value);
+	return rc;
+    }
 
     rc = orte_gpr.put(1, values);
     if(ORTE_SUCCESS != rc) {
diff --git a/orte/mca/pls/xgrid/src/pls_xgrid_module.m b/orte/mca/pls/xgrid/src/pls_xgrid_module.m
index 80dfb112cc..50e5f8cec8 100644
--- a/orte/mca/pls/xgrid/src/pls_xgrid_module.m
+++ b/orte/mca/pls/xgrid/src/pls_xgrid_module.m
@@ -124,7 +124,7 @@ orte_pls_xgrid_terminate_job(orte_jobid_t jobid)
     char *keys[2];
     char *jobid_string;
     orte_gpr_value_t** values = NULL;
-    orte_process_name *name;
+    orte_process_name_t *name;
     size_t i, j, num_values = 0;
     int rc;