Index: trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- trunk/psLib/src/types/psMetadataConfig.c	(revision 23269)
+++ trunk/psLib/src/types/psMetadataConfig.c	(revision 23288)
@@ -1477,6 +1477,13 @@
             }
 
-            psString newStr = psMetadataConfigFormat(item->data.md);
-            if (newStr) {
+            psMetadata *md = item->data.md; // Metadata at new level
+            if (md) {
+                psString newStr = psMetadataConfigFormat(item->data.md);
+                if (!newStr) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to format metadata %s", item->name);
+                    psFree(content);
+                    return NULL;
+                }
+
                 // add 3 extra spaces to each metadata folder item
                 char *buf = strtok(newStr, "\n");
@@ -1487,5 +1494,4 @@
                 psFree(newStr);
             }
-
             psStringAppend(&content, "\nEND\n");
             break;