diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwloc/base/hwloc_base_util.c
index 33ebabb567..0e2160ae9b 100644
--- a/opal/mca/hwloc/base/hwloc_base_util.c
+++ b/opal/mca/hwloc/base/hwloc_base_util.c
@@ -1449,6 +1449,17 @@ char* opal_hwloc_base_print_locality(opal_paffinity_locality_t locality)
     }
     if (0 < idx) {
         ptr->buffers[ptr->cntr][idx-1] = '\0';
+    } else if (OPAL_PROC_NON_LOCAL & locality) {
+        ptr->buffers[ptr->cntr][idx++] = 'N';
+        ptr->buffers[ptr->cntr][idx++] = 'O';
+        ptr->buffers[ptr->cntr][idx++] = 'N';
+        ptr->buffers[ptr->cntr][idx++] = '\0';
+    } else {
+        /* must be an unknown locality */
+        ptr->buffers[ptr->cntr][idx++] = 'U';
+        ptr->buffers[ptr->cntr][idx++] = 'N';
+        ptr->buffers[ptr->cntr][idx++] = 'K';
+        ptr->buffers[ptr->cntr][idx++] = '\0';
     }
     return ptr->buffers[ptr->cntr];
 }
diff --git a/orte/mca/grpcomm/pmi/grpcomm_pmi_module.c b/orte/mca/grpcomm/pmi/grpcomm_pmi_module.c
index 9ac61a6e7d..1bdc574069 100644
--- a/orte/mca/grpcomm/pmi/grpcomm_pmi_module.c
+++ b/orte/mca/grpcomm/pmi/grpcomm_pmi_module.c
@@ -471,7 +471,7 @@ static int modex(opal_list_t *procs)
             orte_process_info.num_nodes++;
         }
         /* see if this proc is already in the pidmap */
-        if (NULL == opal_pointer_array_get_item(&jmap->pmap, v)) {
+        if (NULL == (pmap = opal_pointer_array_get_item(&jmap->pmap, v))) {
             /* nope - add it */
             pmap = OBJ_NEW(orte_pmap_t);
             pmap->node = loc->index;