Index: /trunk/psModules/src/config/pmConfig.c
===================================================================
--- /trunk/psModules/src/config/pmConfig.c	(revision 9409)
+++ /trunk/psModules/src/config/pmConfig.c	(revision 9410)
@@ -3,6 +3,6 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-09 20:18:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35,4 +35,5 @@
     psFree(config->files);
     psFree(config->camera);
+    psFree(config->cameraName);
     psFree(config->recipes);
     psFree(config->recipesSource);
@@ -49,4 +50,5 @@
     config->site = NULL;
     config->camera = NULL;
+    config->cameraName = NULL;
     config->recipes = psMetadataAlloc();
     config->recipesRead = P_PM_RECIPE_SOURCE_NONE;
@@ -578,4 +580,5 @@
             if (formatFromHeader(&format, testCamera, header, camerasItem->name)) {
                 config->camera = psMemIncrRefCounter(testCamera);
+                config->cameraName = psStringCopy(camerasItem->name);
             }
             psFree(testCamera);
@@ -595,7 +598,7 @@
 
     // Otherwise, try the specific camera
-    if (!formatFromHeader(&format, config->camera, header, "specified camera")) {
-        psError(PS_ERR_IO, true, "Unable to find a format with the specified camera that matches the "
-                "given header.\n");
+    if (!formatFromHeader(&format, config->camera, header, config->cameraName)) {
+        psError(PS_ERR_IO, true, "Unable to find a format with the specified camera (%s) that matches the "
+                "given header.\n", config->cameraName);
         return NULL;
     }
@@ -603,6 +606,5 @@
 }
 
-// Work out what camera we have, based on the FITS header and a set of rules specified in the IPP
-// configuration; return the camera configuration and format
+// Return the requested camera configuration
 psMetadata *pmConfigCameraByName(
     pmConfig *config,                   // The configuration