Index: /branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c
===================================================================
--- /branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c	(revision 6739)
+++ /branches/rel10_ifa/psModules/src/astrom/pmFPAConstruct.c	(revision 6740)
@@ -169,4 +169,5 @@
     }
     psMetadataAddStr(fpa->concepts, PS_LIST_HEAD, "FPA.NAME", PS_META_REPLACE, "Name of FPA", newFPAname);
+    psFree(newFPAname);                 // Drop reference
 
     // Where does the PHU go?
@@ -372,9 +373,12 @@
 
                 // Put in the extension
-                if (chip->hdu && chip->hdu != hdu) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Overwriting HDU in chip %s\n", chipName);
-                    psFree(chip->hdu);  // Make way!
-                }
-                chip->hdu = psMemIncrRefCounter(hdu);
+                if (chip->hdu) {
+                    if (chip->hdu != hdu) {
+                        psLogMsg(__func__, PS_LOG_WARN, "Overwriting HDU in chip %s\n", chipName);
+                        psFree(chip->hdu);  // Make way!
+                    }
+                } else {
+                    chip->hdu = psMemIncrRefCounter(hdu);
+                }
 
                 // Put in the cell data
@@ -434,9 +438,12 @@
                 // Put in the extension
                 if (cell->hdu) {
-                    psLogMsg(__func__, PS_LOG_WARN, "Overwriting HDU in chip %s, cell %s\n", chipName,
-                             cellName);
-                    psFree(cell->hdu);
-                }
-                cell->hdu = psMemIncrRefCounter(hdu);
+                    if (cell->hdu != hdu) {
+                        psLogMsg(__func__, PS_LOG_WARN, "Overwriting HDU in chip %s, cell %s\n", chipName,
+                                 cellName);
+                        psFree(cell->hdu);
+                    }
+                } else {
+                    cell->hdu = psMemIncrRefCounter(hdu);
+                }
 
                 // Put in the cell data