Index: trunk/archive/pslib/src/Metadata/metadata.c
===================================================================
--- trunk/archive/pslib/src/Metadata/metadata.c	(revision 488)
+++ trunk/archive/pslib/src/Metadata/metadata.c	(revision 566)
@@ -26,4 +26,7 @@
 {
     if (ms == NULL) {
+	return;
+    } else if (psMemGetRefCounter(ms) > 1) {
+	psMemDecrRefCounter(ms);
 	return;
     }
@@ -223,5 +226,5 @@
 	psError(__func__, PS_ERR_UNKNOWN, PS_NEW_ERROR,
 		"Key \"%s\" is already present in the metaDataSet 0x%x", item->name, ms);
-	//psMetadataItemFree(item);
+	psMetadataItemFree(item);
 
 	return NULL;
@@ -236,5 +239,5 @@
 /************************************************************************************************************/
 /*
- * Convenience wrapper for psMetadataAppend()
+ * Convenience wrapper for psMetadataAppendItem()
  */
 psMetadataItem *psMetadataAppend(psMetadata *restrict md, ///< Metadata to add to
@@ -258,5 +261,4 @@
 }
 
-
 /*****************************************************************************/
 /*