Index: branches/pap/ppStack/src/ppStackReadout.c
===================================================================
--- branches/pap/ppStack/src/ppStackReadout.c	(revision 25830)
+++ branches/pap/ppStack/src/ppStackReadout.c	(revision 25924)
@@ -44,5 +44,6 @@
     pmConfig *config = args->data[3];   // Configuration
     bool full = PS_SCALAR_VALUE(args->data[4], U8); // Combine full image?
-    bool normalise = PS_SCALAR_VALUE(args->data[5], U8); // Normalise images?
+    bool safety = PS_SCALAR_VALUE(args->data[5], U8);    // Safety switch on?
+    bool normalise = PS_SCALAR_VALUE(args->data[6], U8); // Normalise images?
 
     psVector *mask = options->inputMask; // Mask for inputs
@@ -53,5 +54,5 @@
 
     bool status = ppStackReadoutFinal(config, target, thread->readouts, mask, rejected,
-                                      weightings, addVariance, full, norm); // Status of operation
+                                      weightings, addVariance, full, safety, norm); // Status of operation
 
     thread->busy = false;
@@ -183,5 +184,5 @@
 bool ppStackReadoutFinal(const pmConfig *config, pmReadout *outRO, const psArray *readouts,
                          const psVector *mask, const psArray *rejected, const psVector *weightings,
-                         const psVector *addVariance, bool full, const psVector *norm)
+                         const psVector *addVariance, bool full, bool safety, const psVector *norm)
 {
     assert(config);
@@ -216,5 +217,5 @@
     if (rejected) {
         // We have rejection from a previous combination: combine without flagging pixels to inspect
-        safe = false;
+        safe &= safety;
         iter = 0;
         combineRej = NAN;