diff --git a/orte/mca/ess/hnp/ess_hnp_module.c b/orte/mca/ess/hnp/ess_hnp_module.c
index f0500fb43f..e5098537da 100644
--- a/orte/mca/ess/hnp/ess_hnp_module.c
+++ b/orte/mca/ess/hnp/ess_hnp_module.c
@@ -481,7 +481,8 @@ static int rte_finalize(void)
  * a shared file system simultaneously...ouch!).
  *
  * However, the HNP is only ONE process, so we can do it
- * here as the core file might prove useful.
+ * here as the core file might prove useful. Do so -only-
+ * if indicated by the report flag!
  */
 static void rte_abort(int status, bool report)
 {
@@ -502,7 +503,12 @@ static void rte_abort(int status, bool report)
      */
     orte_proc_info_finalize();
     
-    /* Now abort */
-    abort();
+    /* Now exit/abort */
+    if (report) {
+        abort();
+    }
+    
+    /* otherwise, just exit */
+    exit(status);
 }
 
diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c
index 7a6fa19c6d..6237b51a06 100644
--- a/orte/mca/rml/oob/rml_oob_component.c
+++ b/orte/mca/rml/oob/rml_oob_component.c
@@ -442,18 +442,19 @@ rml_oob_recv_route_callback(int status,
 
     next = orte_routed.get_route(&hdr->destination);
     if (next.vpid == ORTE_VPID_INVALID) {
-        opal_output(0,
-                    "%s tried routing message to %s, can't find route",
+        opal_output(0, "%s tried routing message from %s to %s, can't find route",
                     ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
+                    ORTE_NAME_PRINT(&origin),
                     ORTE_NAME_PRINT(&hdr->destination));
-        abort();
+        orte_errmgr.abort(ORTE_ERROR_DEFAULT_EXIT_CODE, NULL);
     }
 
     if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &next, ORTE_PROC_MY_NAME)) {
-        opal_output(0, "%s trying to get message to %s, routing loop",
+        opal_output(0, "%s trying to get message from %s to %s, routing loop",
                     ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
+                    ORTE_NAME_PRINT(&origin),
                     ORTE_NAME_PRINT(&hdr->destination));
-        abort();
+        orte_errmgr.abort(ORTE_ERROR_DEFAULT_EXIT_CODE, NULL);
     }
 
     if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &next, &hdr->destination)) {
@@ -509,7 +510,7 @@ rml_oob_recv_route_callback(int status,
                         ORTE_NAME_PRINT(&next),
                         opal_strerror(ret),
                         ret);
-            abort();
+            orte_errmgr.abort(ORTE_ERROR_DEFAULT_EXIT_CODE, NULL);
         }
     }
 }