Index: /trunk/psLib/src/types/psMetadata.c
===================================================================
--- /trunk/psLib/src/types/psMetadata.c	(revision 9387)
+++ /trunk/psLib/src/types/psMetadata.c	(revision 9388)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.135 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-26 02:55:34 $
+ *  @version $Revision: 1.136 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-07 03:55:24 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -418,19 +418,14 @@
                            const psMetadata *in)
 {
-    //    PS_ASSERT_PTR_NON_NULL(in,NULL);
+    // in == NULL is a valid input, return 'out' as is
     if (in == NULL) {
-        if (out != NULL) {
-            psFree(out);
-            out = NULL;
-        }
-        return out;
-    }
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, "psMetadataCopy: 'in' cannot be NULL");
+        return NULL;
+    }
+
     //    PS_ASSERT_PTR_NON_NULL(in->list,NULL);
     if (in->list == NULL) {
-        if (out != NULL) {
-            psFree(out);
-            out = NULL;
-        }
-        return out;
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, "psMetadataCopy: 'in' has NULL list");
+        return NULL;
     }
 
@@ -457,12 +452,9 @@
             psFree(newItem);
             psFree(iter);
-            psFree(out);
-            out = NULL;
-            return out;
+            return NULL;
         }
         psFree(newItem);                // Drop reference
     }
     psFree(iter);
-
     return out;
 }