Index: trunk/psModules/src/camera/pmFPACopy.c
===================================================================
--- trunk/psModules/src/camera/pmFPACopy.c	(revision 11871)
+++ trunk/psModules/src/camera/pmFPACopy.c	(revision 12564)
@@ -303,9 +303,8 @@
     pmHDU *targetHDU = pmHDUFromCell(target); // The target HDU
     if (targetHDU) {
-        if (!targetHDU->header) {
-            targetHDU->header = psMetadataAlloc();
-        }
         pmHDU *sourceHDU = pmHDUFromCell(source); // The source HDU
-        if (sourceHDU->header) {
+        if (!sourceHDU) {
+            psWarning("Unable to copy header: no source header.");
+        } else if (sourceHDU->header) {
             targetHDU->header = psMetadataCopy(targetHDU->header, sourceHDU->header);
         }
@@ -315,7 +314,4 @@
     pmHDU *targetPHU = findBlankPHU(target); // The target PHU
     if (targetPHU && targetPHU != targetHDU) {
-        if (!targetPHU->header) {
-            targetPHU->header = psMetadataAlloc();
-        }
 //        pmHDU *sourcePHU = pmHDUGetHighest(source->parent->parent, source->parent, source); // A source HDU
         pmHDU *sourcePHU = findBlankPHU(source); // The target PHU