Index: trunk/ppStats/src/ppStatsStandAlone.c
===================================================================
--- trunk/ppStats/src/ppStatsStandAlone.c	(revision 13628)
+++ trunk/ppStats/src/ppStatsStandAlone.c	(revision 13640)
@@ -52,7 +52,5 @@
         } else {
             psErrorStackPrint(stderr, "Unable to open output file %s.\n", resolved);
-            psFree(resolved);
-            status = PS_EXIT_CONFIG_ERROR;
-            goto die;
+            exit(PS_EXIT_CONFIG_ERROR);
         }
         psFree(resolved);
@@ -60,10 +58,12 @@
 
     // Go through the FPA and do the hard work
-    psMetadata *results = ppStatsLoop(NULL, data, config);
+    psMetadata *results = ppStatsLoop(&status, NULL, data, config);
+    if (status != PS_EXIT_SUCCESS) {
+        psErrorStackPrint(stderr, "Error in stats loop.\n");
+	exit (status);
+    }
     if (psListLength(results->list) == 0) {
         psErrorStackPrint(stderr, "No output.\n");
-        psFree(results);
-        status = PS_EXIT_DATA_ERROR;
-        goto die;
+	exit (status);
     }
 
@@ -78,6 +78,5 @@
         psErrorStackPrint(stderr, "Unable to generate configuration file with result.\n");
         psFree(results);
-        status = PS_EXIT_CONFIG_ERROR;
-        goto die;
+        exit(PS_EXIT_CONFIG_ERROR);
     }
     fprintf(outFile, "%s", output);