Index: trunk/psModules/src/camera/pmFPAfile.c
===================================================================
--- trunk/psModules/src/camera/pmFPAfile.c	(revision 23487)
+++ trunk/psModules/src/camera/pmFPAfile.c	(revision 23746)
@@ -205,11 +205,14 @@
     }
     if (strstr(newName, "{CHIP.NAME}")) {
+        const char *name = NULL;        // Name of chip
         pmChip *chip = pmFPAviewThisChip(view, fpa);
         if (chip) {
-            char *name = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
-            if (name) {
-                psStringSubstitute(&newName, name, "{CHIP.NAME}");
-            }
-        }
+            name = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
+            psAssert(name, "All chips should have a name");
+        } else {
+            name = "fpa";
+        }
+        psStringSubstitute(&newName, name, "{CHIP.NAME}");
+
     }
     if (strstr(newName, "{CHIP.ID}")) {
@@ -255,11 +258,13 @@
     }
     if (strstr(newName, "{CELL.NAME}")) {
+        const char *name = NULL;        // Name of cell
         pmCell *cell = pmFPAviewThisCell(view, fpa);
         if (cell) {
-            char *name = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME");
-            if (name) {
-                psStringSubstitute(&newName, name, "{CELL.NAME}");
-            }
-        }
+            name = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME");
+            psAssert(name, "All cells should have a name");
+        } else {
+            name = "chip";
+        }
+        psStringSubstitute(&newName, name, "{CELL.NAME}");
     }
     if (strstr(newName, "{CELL.N}")) {