diff --git a/orte/mca/ess/hnp/ess_hnp_module.c b/orte/mca/ess/hnp/ess_hnp_module.c
index e7f80f56de..7c16e67a69 100644
--- a/orte/mca/ess/hnp/ess_hnp_module.c
+++ b/orte/mca/ess/hnp/ess_hnp_module.c
@@ -489,6 +489,8 @@ static int rte_init(void)
     OBJ_RETAIN(node);  /* keep accounting straight */
     proc->node = node;
     proc->nodename = node->name;
+    /* Assume we won't fail unless notified by a child */
+    proc->exit_code = 0;
     opal_pointer_array_add(jdata->procs, proc);
 
     /* record that the daemon (i.e., us) is on this node 
diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c
index b1ff7d0195..49a689e8e7 100644
--- a/orte/mca/rmaps/base/rmaps_base_support_fns.c
+++ b/orte/mca/rmaps/base/rmaps_base_support_fns.c
@@ -731,6 +731,8 @@ int orte_rmaps_base_define_daemons(orte_job_t *jdata)
             proc->name.vpid = daemons->num_procs;  /* take the next available vpid */
             proc->node = node;
             proc->nodename = node->name;
+            /* Assume we won't fail unless notified by a child */
+            proc->exit_code = 0;
             OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output,
                                  "%s rmaps:base:define_daemons add new daemon %s",
                                  ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),