Index: trunk/psModules/src/camera/pmFPAfileFitsIO.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 25763)
+++ trunk/psModules/src/camera/pmFPAfileFitsIO.c	(revision 25768)
@@ -178,9 +178,4 @@
           pmChip *chip = pmFPAviewThisChip(view, fpa); // Chip of interest, or NULL
           pmCell *cell = pmFPAviewThisCell(view, fpa); // Cell of interest, or NULL
-          if (!pmFPAUpdateNames(fpa, chip, cell, file->imageId, file->sourceId)) {
-              psError(PS_ERR_UNKNOWN, false, "Unable to update names in header.");
-              return false;
-          }
-
           if (cell) {
               if (!pmConceptsWriteCell(cell, true, config)) {
@@ -195,4 +190,9 @@
           } else if (!pmConceptsWriteFPA(fpa, true, config)) {
               psError(PS_ERR_IO, false, "Unable to write concepts for FPA.\n");
+              return false;
+          }
+
+          if (!pmFPAUpdateNames(fpa, chip, cell, file->imageId, file->sourceId)) {
+              psError(PS_ERR_UNKNOWN, false, "Unable to update names in header.");
               return false;
           }