Index: trunk/ppStack/src/ppStackLoop.c
===================================================================
--- trunk/ppStack/src/ppStackLoop.c	(revision 22718)
+++ trunk/ppStack/src/ppStackLoop.c	(revision 22730)
@@ -1163,6 +1163,9 @@
         fileActivation(config, photFiles, true);
         pmFPAview *photView = filesIterateDown(config);
+        fileActivation(config, combineFiles, true);
+
         if (!ppStackPhotometry(config, outRO, photView)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry on output.");
+            filesIterateUp(config);
             psFree(outRO);
             psFree(photView);
@@ -1170,6 +1173,4 @@
         }
         psFree(photView);
-
-        fileActivation(config, combineFiles, true);
 
         if (stats) {
Index: trunk/ppStack/src/ppStackPhotometry.c
===================================================================
--- trunk/ppStack/src/ppStackPhotometry.c	(revision 22718)
+++ trunk/ppStack/src/ppStackPhotometry.c	(revision 22730)
@@ -149,7 +149,6 @@
     if (!psphotReadoutKnownSources(config, view, inSources)) {
         // Clear the error, so that the output files are written.
-        psWarning("Unable to perform photometry on stacked image.");
-        psErrorStackPrint(stderr, "Error stack from photometry:");
-        psErrorClear();
+        psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry on stacked image.");
+        return false;
     }