Index: trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr	(revision 2273)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stderr	(revision 2281)
@@ -1,44 +1,44 @@
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Failed to parse value. Value: 9876.54qqq32 Line 90: xPosition    F64          9876.54qqq32
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Null value not allowed. Line 96: yPosition    F64          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Invalid psMetadataType. Type: 99.999 Line 102: zPosition       99.999          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    More than one * charecter not allowed. Line 108: aPosition   **          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    More than one @ charecter not allowed. Line 114: @@bPosition     F64     22.33             
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Illegal character. Character:~ Line 120: range     F64     140.0 ~             
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Failed to parse value. Value: 9876.54qqq32 Line 90: xPosition    F64          9876.54qqq32
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Null value not allowed. Line 96: yPosition    F64          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Invalid psMetadataType. Type: 99.999 Line 102: zPosition       99.999          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    More than one * charecter not allowed. Line 108: aPosition   **          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    More than one @ charecter not allowed. Line 114: @@bPosition     F64     22.33             
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Illegal character. Character:~ Line 120: range     F64     140.0 ~             
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Overwrite for name not allowed. Name: speed. Line 128: speed     F32     66.66
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Failed to parse value. Value: 9876.54qqq32 Line 90: xPosition    F64          9876.54qqq32
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Null value not allowed. Line 96: yPosition    F64          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Invalid psMetadataType. Type: 99.999 Line 102: zPosition       99.999          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    More than one * charecter not allowed. Line 108: aPosition   **          
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    More than one @ charecter not allowed. Line 114: @@bPosition     F64     22.33             
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Illegal character. Character:~ Line 120: range     F64     140.0 ~             
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Overwrite for name not allowed. Name: speed. Line 128: speed     F32     66.66
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Null fileName not allowed
-<DATE><TIME>|<HOST>|E|psMetadataParseConfig
-    Couldn't open file. Name: abcedfg
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Failed to read a metadata value on line 96 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Metadata type '99.999', found on line 102 of test.config, is not invalid.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '*' character not allowed.  Found on line 108 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '@' character not allowed.  Found on line 114 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '~' character not allowed.  Found on line 120 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Failed to read a metadata value on line 96 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Metadata type '99.999', found on line 102 of test.config, is not invalid.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '*' character not allowed.  Found on line 108 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '@' character not allowed.  Found on line 114 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '~' character not allowed.  Found on line 120 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Duplicate Metadata item, speed, found on line 128 of test.config.  Overwrite not allowed.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Failed to parse the value '9876.54qqq32' of metadata item xPosition, type F64, on line 90 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Failed to read a metadata value on line 96 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Metadata type '99.999', found on line 102 of test.config, is not invalid.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '*' character not allowed.  Found on line 108 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '@' character not allowed.  Found on line 114 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    More than one '~' character not allowed.  Found on line 120 of test.config.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Duplicate Metadata item, speed, found on line 128 of test.config.  Overwrite not allowed.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Unallowable operation: fileName is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataParseConfig (psMetadataIO.c:<LINENO>)
+    Failed to open file 'abcedfg'.  Check if it exists and it has the proper permissions.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 2273)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 2281)
@@ -1,10 +1,10 @@
 <DATE><TIME>|<HOST>|I|main
     Following should produce error for null name.
-<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
-    Null value for name not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
-    Invalid psMetadataType: 7
-<DATE><TIME>|<HOST>|E|psMetadataAddItem
-    Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataAddItem
-    Null metadata item not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
+    Unallowable operation: name is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
+    Specified psMetadataType, 7, is not supported.
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+    Unallowable operation: md is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+    Unallowable operation: metadataItem is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 2273)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr	(revision 2281)
@@ -1,20 +1,20 @@
-<DATE><TIME>|<HOST>|E|psMetadataRemove
-    Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataRemove
-    Couldn't find metadata item. Name: AARGH
-<DATE><TIME>|<HOST>|E|psMetadataRemove
-    Couldn't find metadata item in list. Index: 22
-<DATE><TIME>|<HOST>|E|psMetadataAddItem
-    Null metadata table not allowed
-<DATE><TIME>|<HOST>|E|psMetadataRemove
-    Null metadata table not allowed
-<DATE><TIME>|<HOST>|E|psMetadataAddItem
-    Null metadata list not allowed
-<DATE><TIME>|<HOST>|E|psMetadataRemove
-    Null metadata list not allowed
-<DATE><TIME>|<HOST>|E|psMetadataAddItem
-    Null key item not allowed
-<DATE><TIME>|<HOST>|E|psMetadataAddItem
-    Null metadata table not allowed
-<DATE><TIME>|<HOST>|E|psMetadataAdd
-    Couldn't add metadata item to metadata collection list. Name: errItem
+<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+    Unallowable operation: md is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+    Could not find metadata item, AARGH.
+<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+    Could not find metadata item at index 22.
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+    Unallowable operation: md->table is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+    Unallowable operation: md->table is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+    Unallowable operation: md->list is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataRemove (psMetadata.c:<LINENO>)
+    Unallowable operation: md->list is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+    Unallowable operation: metadataItem->name is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataAddItem (psMetadata.c:<LINENO>)
+    Unallowable operation: md->table is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataAdd (psMetadata.c:<LINENO>)
+    Failed to add metadata item to metadata collection list.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 2273)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stderr	(revision 2281)
@@ -1,12 +1,12 @@
-<DATE><TIME>|<HOST>|E|psMetadataLookup
-    Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataLookup
-    Null key name not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGet
-    Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGet
-    Couldn't find metadata item with given index. Index: 22
-<DATE><TIME>|<HOST>|E|psMetadataLookup
-    Null metadata table not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGet
-    Null metadata list not allowed
+<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+    Unallowable operation: md is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+    Unallowable operation: key is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+    Unallowable operation: md is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+    Could not find metadata item at index 22.
+<DATE><TIME>|<HOST>|E|psMetadataLookup (psMetadata.c:<LINENO>)
+    Unallowable operation: md->table is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataGet (psMetadata.c:<LINENO>)
+    Unallowable operation: md->list is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 2273)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stderr	(revision 2281)
@@ -1,22 +1,22 @@
-<DATE><TIME>|<HOST>|E|psMetadataItemAllocV
-    Invalid psMetadataType: 11
-<DATE><TIME>|<HOST>|E|psMetadataGetPrevious
-    Null metadata list not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint
-     Invalid psMetadataType to print: 11
-<DATE><TIME>|<HOST>|E|psMetadataSetIterator
-    Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataSetIterator
-    Null metadata list not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGetNext
-    Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGetNext
-    Null metadata list not allowed
-<DATE><TIME>|<HOST>|E|psMetadataGetPrevious
-    Null metadata collection not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint
-    Null file descriptor not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint
-    Null format not allowed
-<DATE><TIME>|<HOST>|E|psMetadataItemPrint
-    Null metadata not allowed
+<DATE><TIME>|<HOST>|E|psMetadataItemAllocV (psMetadata.c:<LINENO>)
+    Specified psMetadataType, 11, is not supported.
+<DATE><TIME>|<HOST>|E|psMetadataGetPrevious (psMetadata.c:<LINENO>)
+    Unallowable operation: md->list is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+    Unallowable operation: metadataItem is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataSetIterator (psMetadata.c:<LINENO>)
+    Unallowable operation: md is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataSetIterator (psMetadata.c:<LINENO>)
+    Unallowable operation: md->list is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataGetNext (psMetadata.c:<LINENO>)
+    Unallowable operation: md is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataGetNext (psMetadata.c:<LINENO>)
+    Unallowable operation: md->list is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataGetPrevious (psMetadata.c:<LINENO>)
+    Unallowable operation: md is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+    Unallowable operation: fd is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+    Unallowable operation: format is NULL.
+<DATE><TIME>|<HOST>|E|psMetadataItemPrint (psMetadataIO.c:<LINENO>)
+    Unallowable operation: metadataItem is NULL.