diff --git a/orte/mca/ess/alps/ess_alps_module.c b/orte/mca/ess/alps/ess_alps_module.c
index 50ff1c6219..d5fb30db04 100644
--- a/orte/mca/ess/alps/ess_alps_module.c
+++ b/orte/mca/ess/alps/ess_alps_module.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -206,7 +206,11 @@ static uint8_t proc_get_locality(orte_process_name_t *proc)
 static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_nid_t *nid;
-    
+
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     if (NULL == (nid = orte_util_lookup_nid(proc))) {
         return ORTE_VPID_INVALID;
     }
diff --git a/orte/mca/ess/cm/ess_cm_module.c b/orte/mca/ess/cm/ess_cm_module.c
index 9c57243803..7c37ce2c1c 100644
--- a/orte/mca/ess/cm/ess_cm_module.c
+++ b/orte/mca/ess/cm/ess_cm_module.c
@@ -1,5 +1,8 @@
 /*
  * Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2009      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
  *
  * $COPYRIGHT$
  * 
@@ -546,6 +549,10 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_proc_t *pdata;
     
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     /* get the job data */
     if (NULL == (pdata = find_proc(proc))) {
         return ORTE_VPID_INVALID;
diff --git a/orte/mca/ess/env/ess_env_module.c b/orte/mca/ess/env/ess_env_module.c
index bc7822fe78..4af0a309d8 100644
--- a/orte/mca/ess/env/ess_env_module.c
+++ b/orte/mca/ess/env/ess_env_module.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -251,7 +251,11 @@ static uint8_t proc_get_locality(orte_process_name_t *proc)
 static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_nid_t *nid;
-    
+
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     if (NULL == (nid = orte_util_lookup_nid(proc))) {
         return ORTE_VPID_INVALID;
     }
diff --git a/orte/mca/ess/hnp/ess_hnp_module.c b/orte/mca/ess/hnp/ess_hnp_module.c
index 6290cda8e6..29709e6946 100644
--- a/orte/mca/ess/hnp/ess_hnp_module.c
+++ b/orte/mca/ess/hnp/ess_hnp_module.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2008 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -661,6 +661,10 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_proc_t *pdata;
     
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     /* get the job data */
      if (NULL == (pdata = find_proc(proc))) {
          return ORTE_VPID_INVALID;
diff --git a/orte/mca/ess/lsf/ess_lsf_module.c b/orte/mca/ess/lsf/ess_lsf_module.c
index 8418622dc0..90756030f1 100644
--- a/orte/mca/ess/lsf/ess_lsf_module.c
+++ b/orte/mca/ess/lsf/ess_lsf_module.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -218,6 +218,10 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_nid_t *nid;
     
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     if (NULL == (nid = orte_util_lookup_nid(proc))) {
         return ORTE_VPID_INVALID;
     }
diff --git a/orte/mca/ess/singleton/ess_singleton_module.c b/orte/mca/ess/singleton/ess_singleton_module.c
index 1d055e6a95..76066bbca6 100644
--- a/orte/mca/ess/singleton/ess_singleton_module.c
+++ b/orte/mca/ess/singleton/ess_singleton_module.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -415,6 +415,10 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_nid_t *nid;
     
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     if (NULL == (nid = orte_util_lookup_nid(proc))) {
         return ORTE_VPID_INVALID;
     }
diff --git a/orte/mca/ess/slurm/ess_slurm_module.c b/orte/mca/ess/slurm/ess_slurm_module.c
index 061add1316..a5fcead7ea 100644
--- a/orte/mca/ess/slurm/ess_slurm_module.c
+++ b/orte/mca/ess/slurm/ess_slurm_module.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -223,11 +223,11 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_nid_t *nid;
     
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     if (NULL == (nid = orte_util_lookup_nid(proc))) {
-        /* don't generate an error message here - it could be a call to
-         * get a route to a proc in an unknown job. Let the caller decide
-         * if an error message is required
-         */
         return ORTE_VPID_INVALID;
     }
     
diff --git a/orte/mca/ess/slurmd/ess_slurmd_module.c b/orte/mca/ess/slurmd/ess_slurmd_module.c
index 93a8cb2c12..d242cbe191 100644
--- a/orte/mca/ess/slurmd/ess_slurmd_module.c
+++ b/orte/mca/ess/slurmd/ess_slurmd_module.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -396,11 +396,11 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_nid_t *nid;
     
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     if (NULL == (nid = orte_util_lookup_nid(proc))) {
-        /* don't generate an error message here - it could be a call to
-         * get a route to a proc in an unknown job. Let the caller decide
-         * if an error message is required
-         */
         return ORTE_VPID_INVALID;
     }
     
diff --git a/orte/mca/ess/tm/ess_tm_module.c b/orte/mca/ess/tm/ess_tm_module.c
index 139610791f..a6c3e832c6 100644
--- a/orte/mca/ess/tm/ess_tm_module.c
+++ b/orte/mca/ess/tm/ess_tm_module.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
  *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2009 The University of Tennessee and The University
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -220,11 +220,11 @@ static orte_vpid_t proc_get_daemon(orte_process_name_t *proc)
 {
     orte_nid_t *nid;
     
+    if( ORTE_JOBID_IS_DAEMON(proc->jobid) ) {
+        return proc->vpid;
+    }
+
     if (NULL == (nid = orte_util_lookup_nid(proc))) {
-        /* don't generate an error message here - it could be a call to
-         * get a route to a proc in an unknown job. Let the caller decide
-         * if an error message is required
-         */
         return ORTE_VPID_INVALID;
     }