Index: /trunk/Ohana/src/opihi/pcontrol/GetJobOutput.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/GetJobOutput.c	(revision 13719)
+++ /trunk/Ohana/src/opihi/pcontrol/GetJobOutput.c	(revision 13720)
@@ -62,4 +62,4 @@
 
   gprint (GP_ERR, "programming error: should not reach here (GetJobOutput)\n");
-  exit (1);
+  pcontrol_exit (1);
 }
Index: /trunk/Ohana/src/opihi/pcontrol/HostOps.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/HostOps.c	(revision 13719)
+++ /trunk/Ohana/src/opihi/pcontrol/HostOps.c	(revision 13720)
@@ -24,5 +24,5 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 
@@ -36,5 +36,5 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 
Index: /trunk/Ohana/src/opihi/pcontrol/JobOps.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/JobOps.c	(revision 13719)
+++ /trunk/Ohana/src/opihi/pcontrol/JobOps.c	(revision 13720)
@@ -27,5 +27,5 @@
   }
   gprint (GP_ERR, "error: unknown host stack : programming error\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 
@@ -40,5 +40,5 @@
   }
   gprint (GP_ERR, "error: unknown job stack : programming error\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 
Index: /trunk/Ohana/src/opihi/pcontrol/ResetJob.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/ResetJob.c	(revision 13719)
+++ /trunk/Ohana/src/opihi/pcontrol/ResetJob.c	(revision 13720)
@@ -43,9 +43,9 @@
     default:
       gprint (GP_ERR, "unknown status for pclient command: programming error\n");  
-      exit (1);
+      pcontrol_exit (1);
   }
 
   gprint (GP_ERR, "programming error in GetJobOutput (should not reach here)\n");
-  exit (1);
+  pcontrol_exit (1);
 }
 
Index: /trunk/Ohana/src/opihi/pcontrol/StopHosts.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/StopHosts.c	(revision 13719)
+++ /trunk/Ohana/src/opihi/pcontrol/StopHosts.c	(revision 13720)
@@ -91,5 +91,5 @@
     default:
       gprint (GP_ERR, "unknown status for pclient command: programming error\n");  
-      exit (1);
+      pcontrol_exit (1);
   }
   HarvestHost (host[0].pid);
@@ -139,5 +139,5 @@
       if (result != pid) {
 	gprint (GP_ERR, "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pid);
-	exit (1);
+	pcontrol_exit (1);
       }
       
@@ -149,6 +149,6 @@
       }
       if (WIFSTOPPED(waitstatus)) {
-	if (VerboseMode()) gprint (GP_ERR, "waitpid returns 'stopped': programming error\n");
-	exit (1);
+        gprint (GP_ERR, "waitpid returns 'stopped': programming error\n");
+	pcontrol_exit (1);
       }
   }
Index: /trunk/Ohana/src/opihi/pcontrol/pcontrol.c.in
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/pcontrol.c.in	(revision 13719)
+++ /trunk/Ohana/src/opihi/pcontrol/pcontrol.c.in	(revision 13720)
@@ -85,4 +85,10 @@
   int status;
   status = opihi (argc, argv);
+  abort ();	
   exit (status);
 }
+
+void pcontrol_exit (int n) {
+  abort ();
+  exit (n);
+}
Index: /trunk/Ohana/src/opihi/pcontrol/rconnect.c
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/rconnect.c	(revision 13719)
+++ /trunk/Ohana/src/opihi/pcontrol/rconnect.c	(revision 13720)
@@ -58,5 +58,5 @@
     status = execvp (argv[0], argv); 
     gprint (GP_ERR, "error starting remote shell process\n");
-    exit (1);
+    pcontrol_exit (1);
   }
   free (argv);
@@ -122,5 +122,5 @@
   if ((result == -1) && (errno != ECHILD)) {
     gprint (GP_ERR, "unexpected error from waitpid (%d): programming error\n", errno);
-    exit (1);
+    pcontrol_exit (1);
   }
   if (result == 0) {
@@ -130,9 +130,9 @@
     if (result != pid) {
       gprint (GP_ERR, "waitpid error: mis-matched PID (%d vs %d).  programming error\n", result, pid);
-      exit (1);
+      pcontrol_exit (1);
     }
     if (WIFSTOPPED(waitstatus)) {
       gprint (GP_ERR, "waitpid returns 'stopped': programming error\n");
-      exit (1);
+      pcontrol_exit (1);
     }
   }