Index: /trunk/ppStats/src/ppStatsUtils.c
===================================================================
--- /trunk/ppStats/src/ppStatsUtils.c	(revision 16409)
+++ /trunk/ppStats/src/ppStatsUtils.c	(revision 16410)
@@ -2,8 +2,15 @@
 
 void p_ppStatsGetMetadata(psMetadata *target, // Target for metadata
-			  psMetadata *source, // Source for metadata
-			  psList *list    // List containing keywords
+                          psMetadata *source, // Source for metadata
+                          psList *list    // List containing keywords
     )
 {
+    assert(target);
+    assert(list);
+    if (!source) {
+        // Nothing to get from!
+        return;
+    }
+
     psListIterator *iterator = psListIteratorAlloc(list, PS_LIST_HEAD, false); // Iterator
     psString name;                      // Name from iteration
@@ -19,7 +26,7 @@
 
 void p_ppStatsGetAnalysis(psMetadata *target, // Output Target for metadata
-			  psList *headers,    // List containing desired keywords
-			  psMetadata *source, // Input Source for metadata
-			  psList *list        // List containing analysis blocks
+                          psList *headers,    // List containing desired keywords
+                          psMetadata *source, // Input Source for metadata
+                          psList *list        // List containing analysis blocks
     )
 {
@@ -31,5 +38,5 @@
         psMetadata *folder = psMetadataLookupMetadata(&status, source, name); // Item of interest, or NULL
         if (folder) {
-            p_ppStatsGetMetadata (target, folder, headers); 
+            p_ppStatsGetMetadata (target, folder, headers);
         }
     }
@@ -39,5 +46,5 @@
 
 bool p_ppStatsDoThis(psList *toDoList,    // List of things to do
-		     const char *this     // The name of "this"
+                     const char *this     // The name of "this"
     )
 {
@@ -62,7 +69,7 @@
 
 void p_ppStatsAddToHierarchy(psMetadata *source, // Source to add
-			     psMetadata *target, // Target to which to add
-			     const char *name, // Name of source
-			     const char *comment // Comment for source
+                             psMetadata *target, // Target to which to add
+                             const char *name, // Name of source
+                             const char *comment // Comment for source
     )
 {