Index: trunk/ppStack/src/ppStackPhotometry.c
===================================================================
--- trunk/ppStack/src/ppStackPhotometry.c	(revision 33702)
+++ trunk/ppStack/src/ppStackPhotometry.c	(revision 42094)
@@ -19,5 +19,7 @@
     ppStackFileActivation(config, PPSTACK_FILES_PHOT, true);
     pmFPAview *photView = ppStackFilesIterateDown(config); // View to readout
-    ppStackFileActivation(config, PPSTACK_FILES_STACK, true);
+
+    ppStackFileList stackFiles = options->convolve ? PPSTACK_FILES_STACK : PPSTACK_FILES_UNCONV;
+    ppStackFileActivation(config, stackFiles, true);
 
     pmFPAfile *photFile = psMetadataLookupPtr(NULL, config->files, "PSPHOT.INPUT"); // File for photometry
@@ -57,5 +59,5 @@
     // psphotSetNFrames
     pmReadout *photRO = pmFPAviewThisReadout(photView, photFile->fpa);
-    if (photRO && options->expRO->mask) {
+    if (photRO && options->expRO && options->expRO->mask) {
         psMetadataAddImage(photRO->analysis, PS_LIST_TAIL, "EXPNUM", PS_META_REPLACE, "EXPNUM image", options->expRO->mask);
     }
