Index: trunk/psModules/src/camera/pmFPAfileIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileIO.c	(revision 20400)
+++ trunk/psModules/src/camera/pmFPAfileIO.c	(revision 20639)
@@ -783,5 +783,6 @@
 	  psMetadata *camera = NULL;
 	  psString formatName = NULL;
-          file->format = pmConfigCameraFormatFromHeader (&camera, &formatName, config, phu, true);
+	  psString cameraName = NULL;
+          file->format = pmConfigCameraFormatFromHeader (&camera, &cameraName, &formatName, config, phu, true);
           if (!file->format) {
             psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", file->filename);
@@ -800,4 +801,5 @@
 	  psFree(camera);
 	  psFree(formatName);
+	  psFree(cameraName);
 
 	  // XXX this is really dangerous...
@@ -894,5 +896,5 @@
     if (!file->format) {
         // determine the format (camera is already known); do not load the recipe
-        file->format = pmConfigCameraFormatFromHeader (NULL, &file->formatName, config, phu, false);
+        file->format = pmConfigCameraFormatFromHeader (NULL, NULL, &file->formatName, config, phu, false);
         if (!file->format) {
             psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", file->filename);