Index: trunk/ppMerge/src/ppMergeCheckInputs.c
===================================================================
--- trunk/ppMerge/src/ppMergeCheckInputs.c	(revision 9831)
+++ trunk/ppMerge/src/ppMergeCheckInputs.c	(revision 11249)
@@ -82,10 +82,17 @@
                 continue;
             }
-        } else if (!pmConfigValidateCameraFormat(options->format, header)) {
-            psLogMsg(__func__, PS_LOG_WARN, "Input file %s doesn't match camera format --- ignored.\n", name);
-            // Kick it out
-            psFree(header);
-            data->in->data[i] = NULL;
-            continue;
+        } else {
+	  bool valid = false;
+	  if (!pmConfigValidateCameraFormat(&valid, options->format, header)) {
+	    psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n");
+	    exit (PS_EXIT_CONFIG_ERROR);
+	  }
+	  if (!valid) {
+	    psLogMsg(__func__, PS_LOG_WARN, "Input file %s doesn't match camera format --- ignored.\n", name);
+	    // Kick it out
+	    psFree(header);
+	    data->in->data[i] = NULL;
+	    continue;
+	  }
         }